2005-12-04 14:00:26

by Pierre Ossman

[permalink] [raw]
Subject: [PATCH] [MMC] Proper check of SCR error code

The routine reading the SCR wasn't paying proper attention to the error
codes returned from the driver.

Signed-off-by: Pierre Ossman <[email protected]>
---

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 d336a1d..b586a83 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -932,8 +932,9 @@ static void mmc_read_scrs(struct mmc_hos

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


2005-12-05 10:01:59

by Russell King

[permalink] [raw]
Subject: Re: [PATCH] [MMC] Proper check of SCR error code

On Sun, Dec 04, 2005 at 03:00:19PM +0100, Pierre Ossman wrote:
> The routine reading the SCR wasn't paying proper attention to the error
> codes returned from the driver.

Applied, thanks Pierre.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core