diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 18:25:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 18:25:15 -0500 |
| commit | 7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5 (patch) | |
| tree | 8c1d92c9af1078bef9d8291c8be36045c4515471 /drivers | |
| parent | 1ff9ba7af6033475998be61c7d1dc0e0c8c11181 (diff) | |
| parent | e781de44153885d5f772731726b4c0c16f8af021 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/mmc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d336a1d65dc7..b586a83a9b4c 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c | |||
| @@ -932,8 +932,9 @@ static void mmc_read_scrs(struct mmc_host *host) | |||
| 932 | 932 | ||
| 933 | sg_init_one(&sg, (u8*)card->raw_scr, 8); | 933 | sg_init_one(&sg, (u8*)card->raw_scr, 8); |
| 934 | 934 | ||
| 935 | err = mmc_wait_for_req(host, &mrq); | 935 | mmc_wait_for_req(host, &mrq); |
| 936 | if (err != MMC_ERR_NONE) { | 936 | |
| 937 | if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) { | ||
| 937 | mmc_card_set_dead(card); | 938 | mmc_card_set_dead(card); |
| 938 | continue; | 939 | continue; |
| 939 | } | 940 | } |