Commit 7c9dfb59 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

parents 1ff9ba7a e781de44
...@@ -932,8 +932,9 @@ static void mmc_read_scrs(struct mmc_host *host) ...@@ -932,8 +932,9 @@ static void mmc_read_scrs(struct mmc_host *host)
sg_init_one(&sg, (u8*)card->raw_scr, 8); sg_init_one(&sg, (u8*)card->raw_scr, 8);
err = mmc_wait_for_req(host, &mrq); mmc_wait_for_req(host, &mrq);
if (err != MMC_ERR_NONE) {
if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
mmc_card_set_dead(card); mmc_card_set_dead(card);
continue; continue;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment