diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2007-06-06 14:23:25 -0400 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-06-07 03:25:54 -0400 |
| commit | 71651297a448289353b2493c6c3c183f9be7be7c (patch) | |
| tree | a490ad82f102970f180fb89aa9ed16509b675012 /drivers/mmc | |
| parent | 60da8de671cc314c75118768052d04ea92eaed4d (diff) | |
mmc: fix broken if clause
Fix a broken if clause which was causing SD cards to go into
4-bit mode even if the host did not support it.
(Reported by David Brownell and Marc Pignat)
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index c1dfd03d559a..5afac2081185 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c | |||
| @@ -402,7 +402,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, | |||
| 402 | /* | 402 | /* |
| 403 | * Switch to wider bus (if supported). | 403 | * Switch to wider bus (if supported). |
| 404 | */ | 404 | */ |
| 405 | if ((host->caps && MMC_CAP_4_BIT_DATA) && | 405 | if ((host->caps & MMC_CAP_4_BIT_DATA) && |
| 406 | (card->scr.bus_widths & SD_SCR_BUS_WIDTH_4)) { | 406 | (card->scr.bus_widths & SD_SCR_BUS_WIDTH_4)) { |
| 407 | err = mmc_app_set_bus_width(card, MMC_BUS_WIDTH_4); | 407 | err = mmc_app_set_bus_width(card, MMC_BUS_WIDTH_4); |
| 408 | if (err != MMC_ERR_NONE) | 408 | if (err != MMC_ERR_NONE) |