From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Sat, 13 Sep 2008 10:02:07 +0000 (+0900)
Subject: mmc_block: handle error from mmc_register_driver()
X-Git-Tag: v2.6.27-rc7~4^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9d4e98e9609bc19d4a8ac4a5c3218358d1820114;p=linux-2.6-omap-h63xx.git

mmc_block: handle error from mmc_register_driver()

Check error from mmc_register_driver() and properly unwind
block device registration.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 86dbb366415..43d9a5b53e8 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -613,14 +613,19 @@ static struct mmc_driver mmc_driver = {
 
 static int __init mmc_blk_init(void)
 {
-	int res = -ENOMEM;
+	int res;
 
 	res = register_blkdev(MMC_BLOCK_MAJOR, "mmc");
 	if (res)
 		goto out;
 
-	return mmc_register_driver(&mmc_driver);
+	res = mmc_register_driver(&mmc_driver);
+	if (res)
+		goto out2;
 
+	return 0;
+ out2:
+	unregister_blkdev(MMC_BLOCK_MAJOR, "mmc");
  out:
 	return res;
 }