From 3adb93a4bb523a5aa1b35dea49429d1721df9993 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Sun, 7 Jan 2007 16:59:06 +0100 Subject: [PATCH] --- yaml --- r: 46211 b: refs/heads/master c: ae06eaf9abb1fd00e413753786e13406eda5819a h: refs/heads/master i: 46209: 4f65474bca1bd559738a5447d284d0a475e6222a 46207: f8b0fbcffa244228a2f85b4dd44dce944610ef2b v: v3 --- [refs] | 2 +- trunk/drivers/mmc/mmc.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4312058e54e7..778f3d99e761 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ba593a97206fb96dc0e63f209e6ade86452844f +refs/heads/master: ae06eaf9abb1fd00e413753786e13406eda5819a diff --git a/trunk/drivers/mmc/mmc.c b/trunk/drivers/mmc/mmc.c index fb04bdd26c36..5046a1661342 100644 --- a/trunk/drivers/mmc/mmc.c +++ b/trunk/drivers/mmc/mmc.c @@ -1092,7 +1092,8 @@ static void mmc_process_ext_csds(struct mmc_host *host) mmc_wait_for_req(host, &mrq); if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) { - mmc_card_set_dead(card); + printk("%s: unable to read EXT_CSD, performance " + "might suffer.\n", mmc_hostname(card->host)); continue; } @@ -1108,7 +1109,6 @@ static void mmc_process_ext_csds(struct mmc_host *host) printk("%s: card is mmc v4 but doesn't support " "any high-speed modes.\n", mmc_hostname(card->host)); - mmc_card_set_bad(card); continue; } @@ -1289,7 +1289,9 @@ static void mmc_read_switch_caps(struct mmc_host *host) mmc_wait_for_req(host, &mrq); if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) { - mmc_card_set_dead(card); + printk("%s: unable to read switch capabilities, " + "performance might suffer.\n", + mmc_hostname(card->host)); continue; } @@ -1321,12 +1323,8 @@ static void mmc_read_switch_caps(struct mmc_host *host) mmc_wait_for_req(host, &mrq); - if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) { - mmc_card_set_dead(card); - continue; - } - - if ((status[16] & 0xF) != 1) { + if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE || + (status[16] & 0xF) != 1) { printk(KERN_WARNING "%s: Problem switching card " "into high-speed mode!\n", mmc_hostname(host));