[PATCH] Driver core: fix error handling in device_bind_driver()

[Dmitry Torokhov]

Subject: Driver core: fix error handling in device_bind_driver()
From: Dmitry Torokhov <dtor@xxxxxxxxxxxxx>

When link creation fails we not only need to signal error
but also remove device from driver's list of bound devices.

Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
---

 drivers/base/dd.c |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

Index: work/drivers/base/dd.c
===================================================================
--- work.orig/drivers/base/dd.c
+++ work/drivers/base/dd.c
@@ -41,7 +41,7 @@
  */
 int device_bind_driver(struct device *dev)
 {
-	int ret;
+	int error;
 
 	if (klist_node_attached(&dev->knode_driver)) {
 		printk(KERN_WARNING "%s: device %s already bound\n",
@@ -52,16 +52,23 @@ int device_bind_driver(struct device *de
 	pr_debug("bound device '%s' to driver '%s'\n",
 		 dev->bus_id, dev->driver->name);
 	klist_add_tail(&dev->knode_driver, &dev->driver->klist_devices);
-	ret = sysfs_create_link(&dev->driver->kobj, &dev->kobj,
-			  kobject_name(&dev->kobj));
-	if (ret == 0) {
-		ret = sysfs_create_link(&dev->kobj, &dev->driver->kobj,
-					"driver");
-		if (ret)
-			sysfs_remove_link(&dev->driver->kobj,
-					kobject_name(&dev->kobj));
-	}
-	return ret;
+	error = sysfs_create_link(&dev->driver->kobj, &dev->kobj,
+				  kobject_name(&dev->kobj));
+	if (error)
+		goto err_remove_list;
+
+	error = sysfs_create_link(&dev->kobj, &dev->driver->kobj,
+				  "driver");
+	if (error)
+		goto err_remove_link;
+
+	return 0;
+
+ err_remove_link:
+	sysfs_remove_link(&dev->driver->kobj, kobject_name(&dev->kobj));
+ err_remove_list:
+	klist_remove(&dev->knode_driver);
+	return error;
 }
 
 struct stupid_thread_structure {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/