From e63f7d792ade8517af1808c9beb5b75cf422fa68 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Sat, 13 Sep 2008 19:02:07 +0900
Subject: [PATCH] --- yaml --- r: 109915 b: refs/heads/master c:
 9d4e98e9609bc19d4a8ac4a5c3218358d1820114 h: refs/heads/master i:   109913:
 bd4cc4b5f50c084482b106266eed0ab8b8fa4040   109911:
 f2c1ee9dc3aafcb5be615c850e0449ac6e3dd4f9 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mmc/card/block.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 63f93dcc2d12..ff9774b18439 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da45b66ec89bbf3a1c172688c35d4d3a6e8e757f
+refs/heads/master: 9d4e98e9609bc19d4a8ac4a5c3218358d1820114
diff --git a/trunk/drivers/mmc/card/block.c b/trunk/drivers/mmc/card/block.c
index 86dbb366415a..43d9a5b53e8d 100644
--- a/trunk/drivers/mmc/card/block.c
+++ b/trunk/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;
 }