lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: fix mmc_set_bus_width_ddr() call without bus-width-test cap

Browse Source 
With the bus-width test patch, mmc_set_bus_width*() isn't called properly
when the driver doesn't set MMC_CAP_BUS_WIDTH and no DDR mode.
This patch fixes the regression by moving the call up before the cap test.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Takashi Iwai
2010-12-22 09:59:44 +01:00
committed by Chris Ball
parent f95f3850f7
commit 08c82dfad2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/core/mmc.c
View File

@@ -558,6 +558,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH,
ext_csd_bits[idx][0]); ext_csd_bits[idx][0]);
if (!err) { if (!err) {
mmc_set_bus_width_ddr(card->host,
bus_width, MMC_SDR_MODE);
/* /*
* If controller can't handle bus width test, * If controller can't handle bus width test,
* use the highest bus width to maintain * use the highest bus width to maintain
@@ -565,8 +567,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
*/ */
if (!(host->caps & MMC_CAP_BUS_WIDTH_TEST)) if (!(host->caps & MMC_CAP_BUS_WIDTH_TEST))
break; break;
mmc_set_bus_width_ddr(card->host,
bus_width, MMC_SDR_MODE);
err = mmc_bus_test(card, bus_width); err = mmc_bus_test(card, bus_width);
if (!err) if (!err)
break; break;