diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2007-11-02 18:21:13 +0100 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-11-21 18:40:53 +0100 |
| commit | d198f101989d9bb950327f0d043f6203bb862343 (patch) | |
| tree | 1bcbef20c668de6d8287c813d6253f903fc6842f /drivers/mmc | |
| parent | 2ffbb8377c7a0713baf6644e285adc27a5654582 (diff) | |
| download | linux-stable-d198f101989d9bb950327f0d043f6203bb862343.tar.gz linux-stable-d198f101989d9bb950327f0d043f6203bb862343.tar.bz2 linux-stable-d198f101989d9bb950327f0d043f6203bb862343.zip | |
mmc_block: check card state after write
Some cards have been reported to signal that they're ready prematurely.
Checking both the busy bit and card state solves the issue.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/card/block.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index e38d5a3b2a89..acaa05200ae7 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -321,7 +321,13 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) req->rq_disk->disk_name, err); goto cmd_err; } - } while (!(cmd.resp[0] & R1_READY_FOR_DATA)); + /* + * Some cards mishandle the status bits, + * so make sure to check both the busy + * indication and the card state. + */ + } while (!(cmd.resp[0] & R1_READY_FOR_DATA) || + (R1_CURRENT_STATE(cmd.resp[0]) == 7)); #if 0 if (cmd.resp[0] & ~0x00000900) |