From 9ed5787879f33a059704eac311fbf8285c9939bf Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Wed, 6 Jun 2007 20:23:25 +0200 Subject: [PATCH] --- yaml --- r: 57521 b: refs/heads/master c: 71651297a448289353b2493c6c3c183f9be7be7c h: refs/heads/master i: 57519: 3056145e2fc053ded0406ce2f624c364904a24b0 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/sd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 799c7ccec0c6..84541e18aa66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60da8de671cc314c75118768052d04ea92eaed4d +refs/heads/master: 71651297a448289353b2493c6c3c183f9be7be7c diff --git a/trunk/drivers/mmc/core/sd.c b/trunk/drivers/mmc/core/sd.c index c1dfd03d559a..5afac2081185 100644 --- a/trunk/drivers/mmc/core/sd.c +++ b/trunk/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)