shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

mmc: sdio: Fix enable_hs and enable_wide in sdio_reset_comm()

Browse Source 
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Dmitry Shmidt
2010-10-06 17:25:02 -07:00
committed by John Stultz
parent 8d2effe1cf
commit 7923f784f3
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/mmc/core/sdio.c
View File

@@ -1248,7 +1248,7 @@ int sdio_reset_comm(struct mmc_card *card)
if (mmc_host_is_spi(host)) {
err = mmc_spi_set_crc(host, use_spi_crc);
if (err)
goto err;
goto err;
}
if (!mmc_host_is_spi(host)) {
@@ -1267,27 +1267,22 @@ int sdio_reset_comm(struct mmc_card *card)
* Switch to high-speed (if supported).
*/
err = sdio_enable_hs(card);
if (err)
if (err > 0)
mmc_sd_go_highspeed(card);
else if (err)
goto err;
/*
* Change to the card's maximum speed.
*/
if (mmc_card_highspeed(card)) {
/*
* The SDIO specification doesn't mention how
* the CIS transfer speed register relates to
* high-speed, but it seems that 50 MHz is
* mandatory.
*/
mmc_set_clock(host, 50000000);
} else {
mmc_set_clock(host, card->cis.max_dtr);
}
mmc_set_clock(host, mmc_sdio_get_max_clock(card));
err = sdio_enable_wide(card);
if (err)
err = sdio_enable_4bit_bus(card);
if (err > 0)
mmc_set_bus_width(host, MMC_BUS_WIDTH_4);
else if (err)
goto err;
mmc_release_host(host);
return 0;
err: