diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-17 18:52:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-17 18:52:33 +0100 |
| commit | 6adfd6aceba0b315406b56a48733610aa24c70f8 (patch) | |
| tree | 31e2cb13bf4b6d453eac55b417dac48aca42b28d | |
| parent | Merge tag 'ntb-4.10-bugfixes' of git://github.com/jonmason/ntb (diff) | |
| parent | mmc: core: fix multi-bit bus width without high-speed mode (diff) | |
| download | linux-6adfd6aceba0b315406b56a48733610aa24c70f8.tar.xz linux-6adfd6aceba0b315406b56a48733610aa24c70f8.zip | |
Merge tag 'mmc-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fix from Ulf Hansson:
"Fix multi-bit bus width without high-speed mode for MMC"
* tag 'mmc-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: core: fix multi-bit bus width without high-speed mode
| -rw-r--r-- | drivers/mmc/core/mmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index b61b52f9da3d..0fccca075e29 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1706,10 +1706,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, err = mmc_select_hs400(card); if (err) goto free_card; - } else if (mmc_card_hs(card)) { + } else { /* Select the desired bus width optionally */ err = mmc_select_bus_width(card); - if (err > 0) { + if (err > 0 && mmc_card_hs(card)) { err = mmc_select_hs_ddr(card); if (err) goto free_card; |