diff options
author | Jarkko Lavinen <jarkko.lavinen@nokia.com> | 2010-01-08 17:42:59 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-11 12:34:06 -0500 |
commit | 0a74ff29b8dd8b748f8856352f9a9b5c6cc362cc (patch) | |
tree | a99376bf5affbb1a50ba7fde1b4e8a36ce765191 /drivers/mmc | |
parent | 7d92df692994472cab6045bbd9d0e2c4afa4365f (diff) |
mmc_block: fix probe error cleanup bug
If mmc_blk_set_blksize() fails mmc_blk_probe() the request queue and its
thread have been set up and they need to be shut down properly before
putting the disk.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Cc: <linux-mmc@vger.kernel.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/card/block.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 5988573bb843..ee879117017f 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
@@ -618,6 +618,7 @@ static int mmc_blk_probe(struct mmc_card *card) | |||
618 | return 0; | 618 | return 0; |
619 | 619 | ||
620 | out: | 620 | out: |
621 | mmc_cleanup_queue(&md->queue); | ||
621 | mmc_blk_put(md); | 622 | mmc_blk_put(md); |
622 | 623 | ||
623 | return err; | 624 | return err; |