diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
| commit | 80c7af4074cbb4cb6be5d35c443ea6d5e8838a84 (patch) | |
| tree | e900ad4c0beb4f44f0912b847c3319f11ef57d73 /drivers/mmc/mmc.c | |
| parent | 451ec6ab310602515b361418debe93d00f67e273 (diff) | |
| parent | d00d598ffbba974d9045ba8b95296655fe2162c5 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/mmc/mmc.c')
| -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 | } |