diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-07 17:30:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-07 17:30:17 +0000 |
| commit | 1285c3fefaddedf5358f52cfde3c2b64d8086a04 (patch) | |
| tree | 361f556d6b400e8cb6d16738142db2f69f63ef2f /drivers/mmc/core/mmc.c | |
| parent | 6b038c8d2b99b552f0b025c8a134f8a3c417a3e7 (diff) | |
| parent | b1940cd21c0f4abdce101253e860feff547291b0 (diff) | |
Merge tag 'v3.19-rc3' into spi-sh-msiof
Linux 3.19-rc3
Diffstat (limited to 'drivers/mmc/core/mmc.c')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 02ad79229f65..7466ce098e60 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -886,7 +886,7 @@ static int mmc_select_bus_width(struct mmc_card *card) unsigned idx, bus_width = 0; int err = 0; - if (!mmc_can_ext_csd(card) && + if (!mmc_can_ext_csd(card) || !(host->caps & (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA))) return 0; |