Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1901fb2604fbcd53201f38725182ea807581159e
Commit:     1901fb2604fbcd53201f38725182ea807581159e
Parent:     116af378201ef793424cd10508ccf18b06d8a021
Author:     Kay Sievers <[EMAIL PROTECTED]>
AuthorDate: Sat Oct 7 21:55:55 2006 +0200
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Fri Dec 1 14:51:58 2006 -0800

    Driver core: fix "driver" symlink timing
    
    Create the "driver" link before the child device may be created by
    the probing logic. This makes it possible for userspace (udev), to
    determine the driver property of the parent device, at the time the
    child device is created.
    
    Signed-off-by: Kay Sievers <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/base/dd.c |   82 +++++++++++++++++++++++++++++++++-------------------
 1 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 9c88b1e..510e788 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -26,28 +26,12 @@
 #define to_drv(node) container_of(node, struct device_driver, kobj.entry)
 
 
-/**
- *     device_bind_driver - bind a driver to one device.
- *     @dev:   device.
- *
- *     Allow manual attachment of a driver to a device.
- *     Caller must have already set @dev->driver.
- *
- *     Note that this does not modify the bus reference count
- *     nor take the bus's rwsem. Please verify those are accounted
- *     for before calling this. (It is ok to call with no other effort
- *     from a driver's probe() method.)
- *
- *     This function must be called with @dev->sem held.
- */
-int device_bind_driver(struct device *dev)
+static void driver_bound(struct device *dev)
 {
-       int ret;
-
        if (klist_node_attached(&dev->knode_driver)) {
                printk(KERN_WARNING "%s: device %s already bound\n",
                        __FUNCTION__, kobject_name(&dev->kobj));
-               return 0;
+               return;
        }
 
        pr_debug("bound device '%s' to driver '%s'\n",
@@ -58,6 +42,12 @@ int device_bind_driver(struct device *de
                                             BUS_NOTIFY_BOUND_DRIVER, dev);
 
        klist_add_tail(&dev->knode_driver, &dev->driver->klist_devices);
+}
+
+static int driver_sysfs_add(struct device *dev)
+{
+       int ret;
+
        ret = sysfs_create_link(&dev->driver->kobj, &dev->kobj,
                          kobject_name(&dev->kobj));
        if (ret == 0) {
@@ -70,6 +60,36 @@ int device_bind_driver(struct device *de
        return ret;
 }
 
+static void driver_sysfs_remove(struct device *dev)
+{
+       struct device_driver *drv = dev->driver;
+
+       if (drv) {
+               sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
+               sysfs_remove_link(&dev->kobj, "driver");
+       }
+}
+
+/**
+ *     device_bind_driver - bind a driver to one device.
+ *     @dev:   device.
+ *
+ *     Allow manual attachment of a driver to a device.
+ *     Caller must have already set @dev->driver.
+ *
+ *     Note that this does not modify the bus reference count
+ *     nor take the bus's rwsem. Please verify those are accounted
+ *     for before calling this. (It is ok to call with no other effort
+ *     from a driver's probe() method.)
+ *
+ *     This function must be called with @dev->sem held.
+ */
+int device_bind_driver(struct device *dev)
+{
+       driver_bound(dev);
+       return driver_sysfs_add(dev);
+}
+
 struct stupid_thread_structure {
        struct device_driver *drv;
        struct device *dev;
@@ -90,30 +110,32 @@ static int really_probe(void *void_data)
                 drv->bus->name, drv->name, dev->bus_id);
 
        dev->driver = drv;
+       if (driver_sysfs_add(dev)) {
+               printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n",
+                       __FUNCTION__, dev->bus_id);
+               goto probe_failed;
+       }
+
        if (dev->bus->probe) {
                ret = dev->bus->probe(dev);
-               if (ret) {
-                       dev->driver = NULL;
+               if (ret)
                        goto probe_failed;
-               }
        } else if (drv->probe) {
                ret = drv->probe(dev);
-               if (ret) {
-                       dev->driver = NULL;
+               if (ret)
                        goto probe_failed;
-               }
-       }
-       if (device_bind_driver(dev)) {
-               printk(KERN_ERR "%s: device_bind_driver(%s) failed\n",
-                       __FUNCTION__, dev->bus_id);
-               /* How does undo a ->probe?  We're screwed. */
        }
+
+       driver_bound(dev);
        ret = 1;
        pr_debug("%s: Bound Device %s to Driver %s\n",
                 drv->bus->name, dev->bus_id, drv->name);
        goto done;
 
 probe_failed:
+       driver_sysfs_remove(dev);
+       dev->driver = NULL;
+
        if (ret == -ENODEV || ret == -ENXIO) {
                /* Driver matched, but didn't support device
                 * or device not found.
@@ -289,7 +311,7 @@ static void __device_release_driver(stru
        drv = dev->driver;
        if (drv) {
                get_driver(drv);
-               sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
+               driver_sysfs_remove(dev);
                sysfs_remove_link(&dev->kobj, "driver");
                klist_remove(&dev->knode_driver);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to