Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / base / dd.c

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 29917c7506cb57b2085181163c664ecf777f5ff4..6658da743c3adae5a7b7b1115cf2bcc878d588d4 100644 (file)
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -245,6 +245,10 @@ int device_attach(struct device *dev)
 
        device_lock(dev);
        if (dev->driver) {
+               if (klist_node_attached(&dev->p->knode_driver)) {
+                       ret = 1;
+                       goto out_unlock;
+               }
                ret = device_bind_driver(dev);
                if (ret == 0)
                        ret = 1;
@@ -257,6 +261,7 @@ int device_attach(struct device *dev)
                ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach);
                pm_runtime_put_sync(dev);
        }
+out_unlock:
        device_unlock(dev);
        return ret;
 }
@@ -408,17 +413,16 @@ void *dev_get_drvdata(const struct device *dev)
 }
 EXPORT_SYMBOL(dev_get_drvdata);
 
-void dev_set_drvdata(struct device *dev, void *data)
+int dev_set_drvdata(struct device *dev, void *data)
 {
        int error;
 
-       if (!dev)
-               return;
        if (!dev->p) {
                error = device_private_init(dev);
                if (error)
-                       return;
+                       return error;
        }
        dev->p->driver_data = data;
+       return 0;
 }
 EXPORT_SYMBOL(dev_set_drvdata);