From: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Date: Fri, 8 Jan 2010 22:42:59 +0000 (-0800)
Subject: mmc_block: fix probe error cleanup bug
X-Git-Tag: firefly_0821_release~9833^2~3432
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0a74ff29b8dd8b748f8856352f9a9b5c6cc362cc;p=firefly-linux-kernel-4.4.55.git

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

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)
 	return 0;
 
  out:
+	mmc_cleanup_queue(&md->queue);
 	mmc_blk_put(md);
 
 	return err;