| commit | 7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Dec 12 15:25:15 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Dec 12 15:25:15 2005 -0800 |
| tree | 8c1d92c9af1078bef9d8291c8be36045c4515471 | |
| parent | 1ff9ba7af6033475998be61c7d1dc0e0c8c11181 [diff] | |
| parent | e781de44153885d5f772731726b4c0c16f8af021 [diff] |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d336a1d..b586a83 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c
@@ -932,8 +932,9 @@ 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; }