summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2007-06-06 20:23:25 +0200
committerPierre Ossman <drzeus@drzeus.cx>2007-06-07 09:25:54 +0200
commit71651297a448289353b2493c6c3c183f9be7be7c (patch)
treea490ad82f102970f180fb89aa9ed16509b675012 /drivers
parent60da8de671cc314c75118768052d04ea92eaed4d (diff)
downloadop-kernel-dev-71651297a448289353b2493c6c3c183f9be7be7c.zip
op-kernel-dev-71651297a448289353b2493c6c3c183f9be7be7c.tar.gz
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')
-rw-r--r--drivers/mmc/core/sd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index c1dfd03..5afac20 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,
/*
* Switch to wider bus (if supported).
*/
- if ((host->caps && MMC_CAP_4_BIT_DATA) &&
+ if ((host->caps & MMC_CAP_4_BIT_DATA) &&
(card->scr.bus_widths & SD_SCR_BUS_WIDTH_4)) {
err = mmc_app_set_bus_width(card, MMC_BUS_WIDTH_4);
if (err != MMC_ERR_NONE)
OpenPOWER on IntegriCloud