Driver core: fix error handling in device_bind_driver()
PATCH 1/1 Driver core: fix error handling in device_bind_driver()
Subject: Driver core: fix error handling in device_bind_driver()
From: Dmitry Torokhov <[email protected]>
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 <[email protected]>
---
drivers/base/dd.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-)
drivers/base/dd.c +18 -11
@@ -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 *depr_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 {
drivers/base/dd.c
Quoted 16 lines · On Thu, 12 Oct 2006 01:05:55 -0400 Dmitry Torokhov <[email protected]> wrote:
Subject: Driver core: fix error handling in
device_bind_driver()
From: Dmitry Torokhov <[email protected]>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 <[email protected]>---
drivers/base/dd.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-)Index:
work/drivers/base/dd.c
===================================================================drivers/base/dd.c +0
-0
This code has undergone basic restructuring in Greg's development tree. A patch against rc1-mm1 would apply.