diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
| commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
| tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /drivers/mmc | |
| parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/mmc')
| -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 | } |