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

7c9dfb59 · Linus Torvalds · 1ff9ba7a · e781de44 · 7c9dfb59
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

drivers/mmc/mmc.c drivers/mmc/mmc.c +3 -2

未找到文件。
--- 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);
+		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);
 			continue;
 		}