diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-13 00:25:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-13 00:25:15 +0100 |
| commit | 7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5 (patch) | |
| tree | 8c1d92c9af1078bef9d8291c8be36045c4515471 /drivers | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| parent | [MMC] Proper check of SCR error code (diff) | |
| download | linux-7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5.tar.xz linux-7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5.zip | |
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) 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; } |