From 90ae226fdb6e37f5d6eb43090809b677f09baf46 Mon Sep 17 00:00:00 2001
From: Neil Brown <neilb@notabene.brown>
Date: Sat, 28 Jun 2008 08:31:17 +1000
Subject: [PATCH] --- yaml --- r: 98593 b: refs/heads/master c:
 9bbbca3a0ee09293108b67835c6bdf6196d7bcb3 h: refs/heads/master i:   98591:
 cd2a8d4b2557a98acc83dea4090304a9375315a3 v: v3

---
 [refs]                | 2 +-
 trunk/drivers/md/md.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7d2ffdb9183d..ec968cb55432 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efe311431869b40d67911820a309f9a1a41306f3
+refs/heads/master: 9bbbca3a0ee09293108b67835c6bdf6196d7bcb3
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 7cf512a34ccf..2580ac1b9b0f 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -3897,8 +3897,10 @@ static void autorun_devices(int part)
 
 		md_probe(dev, NULL, NULL);
 		mddev = mddev_find(dev);
-		if (!mddev) {
-			printk(KERN_ERR 
+		if (!mddev || !mddev->gendisk) {
+			if (mddev)
+				mddev_put(mddev);
+			printk(KERN_ERR
 				"md: cannot allocate memory for md drive.\n");
 			break;
 		}