Skip to contentSkip to conversation

driver core fixes: device_add() cleanup on error

PATCH In review Cornelia Huck 1 participant 1 message Sep 22, 2006 Driver core

lore
Share & tools
lore
#0 lore raw

PATCH 6/9 driver core fixes: device_add() cleanup on error

From: Cornelia Huck <[email protected]>

Check for return code of device_create_file() and correct cleanup in the error case in device_add().

---
 drivers/base/core.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/base/core.c +7 -3
@@ -437,14 +437,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;
@@ -454,7 +456,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;
@@ -515,6 +517,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);