Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 23:25:15 +0000 (15:25 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 23:25:15 +0000 (15:25 -0800)
drivers/mmc/mmc.c

index d336a1d65dc7ec0ec165a62218840640207fdaf0..b586a83a9b4c7f12fa60c6c13135c05b60c5de91 100644 (file)
@@ -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;
                }