diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
| commit | 9da305eb089c94c535d1790fd2dec16f44c1689f (patch) | |
| tree | f37f07f148fd7a793233c7f15c0fa9f46212049d /drivers/mmc/mmc.c | |
| parent | d96212ed87d032d2d830e265aae14038dc1f8ad8 (diff) | |
| parent | 14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff) | |
Merge branch 'master'
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 d336a1d65dc..b586a83a9b4 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; } |