drivers/base: device_bind_driver() fix

From: Vitaly Bordug
Date: Wed Jan 24 2007 - 09:17:29 EST



Keeps sysfs from creating link if device is already bound to driver.
Similar behavior was before the rework; now without this patch fixed
PHY will complain about not been able to create file in sysfs.

Signed-off-by: Vitaly Bordug <vbordug@xxxxxxxxxxxxx>
---

drivers/base/dd.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 510e788..6da3d01 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -26,12 +26,12 @@
#define to_drv(node) container_of(node, struct device_driver, kobj.entry)


-static void driver_bound(struct device *dev)
+static int driver_bound(struct device *dev)
{
if (klist_node_attached(&dev->knode_driver)) {
printk(KERN_WARNING "%s: device %s already bound\n",
__FUNCTION__, kobject_name(&dev->kobj));
- return;
+ return 0;
}

pr_debug("bound device '%s' to driver '%s'\n",
@@ -42,6 +42,7 @@ static void driver_bound(struct device *dev)
BUS_NOTIFY_BOUND_DRIVER, dev);

klist_add_tail(&dev->knode_driver, &dev->driver->klist_devices);
+ return 1;
}

static int driver_sysfs_add(struct device *dev)
@@ -86,7 +87,8 @@ static void driver_sysfs_remove(struct device *dev)
*/
int device_bind_driver(struct device *dev)
{
- driver_bound(dev);
+ if (!driver_bound(dev))
+ return 0;
return driver_sysfs_add(dev);
}

Attachment: signature.asc
Description: PGP signature