From 973247c8f3f55901b4e49d837c901758157c76d2 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 9 Aug 2010 17:20:56 -0700
Subject: [PATCH] --- yaml --- r: 207334 b: refs/heads/master c:
 1986aaf828ac8398b3d8d9b4151b08c840414ffe h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/firmware/edd.c | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index ca574a1a1566..1e2742d9d51c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea98eed9bcb62d1319db8b1210712c6a110a886c
+refs/heads/master: 1986aaf828ac8398b3d8d9b4151b08c840414ffe
diff --git a/trunk/drivers/firmware/edd.c b/trunk/drivers/firmware/edd.c
index 110e24e50883..f287fe79edc4 100644
--- a/trunk/drivers/firmware/edd.c
+++ b/trunk/drivers/firmware/edd.c
@@ -744,7 +744,7 @@ static inline int edd_num_devices(void)
 static int __init
 edd_init(void)
 {
-	unsigned int i;
+	int i;
 	int rc=0;
 	struct edd_device *edev;
 
@@ -760,21 +760,27 @@ edd_init(void)
 	if (!edd_kset)
 		return -ENOMEM;
 
-	for (i = 0; i < edd_num_devices() && !rc; i++) {
+	for (i = 0; i < edd_num_devices(); i++) {
 		edev = kzalloc(sizeof (*edev), GFP_KERNEL);
-		if (!edev)
-			return -ENOMEM;
+		if (!edev) {
+			rc = -ENOMEM;
+			goto out;
+		}
 
 		rc = edd_device_register(edev, i);
 		if (rc) {
 			kfree(edev);
-			break;
+			goto out;
 		}
 		edd_devices[i] = edev;
 	}
 
-	if (rc)
-		kset_unregister(edd_kset);
+	return 0;
+
+out:
+	while (--i >= 0)
+		edd_device_unregister(edd_devices[i]);
+	kset_unregister(edd_kset);
 	return rc;
 }