Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Linus Torvalds 2005-12-12 15:25:15 -08:00
commit 7c9dfb5999
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/mmc/mmc.c
View file

@ -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;
} }