From: Pierre Ossman Date: Wed, 6 Jun 2007 18:23:25 +0000 (+0200) Subject: mmc: fix broken if clause X-Git-Tag: v2.6.22-rc5~55^2~1 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71651297a448289353b2493c6c3c183f9be7be7c;p=linux-2.6 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 --- diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index c1dfd03d55..5afac20811 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)