From 6ce842032a2434c472f43f449d1117d82d0fc4e3 Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Fri, 22 Sep 2006 11:37:13 +0200
Subject: [PATCH] --- yaml --- r: 39879 b: refs/heads/master c:
 a306eea40952e6365301e8a2f7d5ffa9c6a1921b h: refs/heads/master i:   39877:
 462edd24ec556d0463be006398bb5db42b20488a   39875:
 06e9b33b15a654ee5d5d1e5448250eb0eb83847c   39871:
 b4866b1fc9c847c7f31042883d84a424203bdb42 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/base/core.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e353e8fe048f..7ffb3131a9df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 513e7337adc32cdfbffecb99953e45a44e812c2d
+refs/heads/master: a306eea40952e6365301e8a2f7d5ffa9c6a1921b
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index aee3743bd4a3..365f709715ef 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -433,14 +433,16 @@ int device_add(struct device *dev)
 	if (dev->driver)
 		dev->uevent_attr.attr.owner = dev->driver->owner;
 	dev->uevent_attr.store = store_uevent;
-	device_create_file(dev, &dev->uevent_attr);
+	error = device_create_file(dev, &dev->uevent_attr);
+	if (error)
+		goto attrError;
 
 	if (MAJOR(dev->devt)) {
 		struct device_attribute *attr;
 		attr = kzalloc(sizeof(*attr), GFP_KERNEL);
 		if (!attr) {
 			error = -ENOMEM;
-			goto PMError;
+			goto ueventattrError;
 		}
 		attr->attr.name = "dev";
 		attr->attr.mode = S_IRUGO;
@@ -450,7 +452,7 @@ int device_add(struct device *dev)
 		error = device_create_file(dev, attr);
 		if (error) {
 			kfree(attr);
-			goto attrError;
+			goto ueventattrError;
 		}
 
 		dev->devt_attr = attr;
@@ -507,6 +509,8 @@ int device_add(struct device *dev)
 		device_remove_file(dev, dev->devt_attr);
 		kfree(dev->devt_attr);
 	}
+ ueventattrError:
+	device_remove_file(dev, &dev->uevent_attr);
  attrError:
 	kobject_uevent(&dev->kobj, KOBJ_REMOVE);
 	kobject_del(&dev->kobj);