aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-12 15:25:15 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-12 15:25:15 -0800
commit7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5 (patch)
tree8c1d92c9af1078bef9d8291c8be36045c4515471
parent1ff9ba7af6033475998be61c7d1dc0e0c8c11181 (diff)
parente781de44153885d5f772731726b4c0c16f8af021 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
-rw-r--r--drivers/mmc/mmc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index d336a1d65dc..b586a83a9b4 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -932,8 +932,9 @@ static void mmc_read_scrs(struct mmc_host *host)
sg_init_one(&sg, (u8*)card->raw_scr, 8);
- err = mmc_wait_for_req(host, &mrq);
- if (err != MMC_ERR_NONE) {
+ mmc_wait_for_req(host, &mrq);
+
+ if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
mmc_card_set_dead(card);
continue;
}