Merge tag 'v3.10.106' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / powerpc / kernel / ibmebus.c

diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 8220baa46faf8ced3c383bb5de46b310b802cbbf..a1812fbc2648223aa418dffa4fb74b36c080d228 100644 (file)
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -180,6 +180,7 @@ static int ibmebus_create_device(struct device_node *dn)
 static int ibmebus_create_devices(const struct of_device_id *matches)
 {
        struct device_node *root, *child;
+       struct device *dev;
        int ret = 0;
 
        root = of_find_node_by_path("/");
@@ -188,9 +189,12 @@ static int ibmebus_create_devices(const struct of_device_id *matches)
                if (!of_match_node(matches, child))
                        continue;
 
-               if (bus_find_device(&ibmebus_bus_type, NULL, child,
-                                   ibmebus_match_node))
+               dev = bus_find_device(&ibmebus_bus_type, NULL, child,
+                                     ibmebus_match_node);
+               if (dev) {
+                       put_device(dev);
                        continue;
+               }
 
                ret = ibmebus_create_device(child);
                if (ret) {
@@ -262,6 +266,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
                                   const char *buf, size_t count)
 {
        struct device_node *dn = NULL;
+       struct device *dev;
        char *path;
        ssize_t rc = 0;
 
@@ -269,8 +274,10 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
        if (!path)
                return -ENOMEM;
 
-       if (bus_find_device(&ibmebus_bus_type, NULL, path,
-                           ibmebus_match_path)) {
+       dev = bus_find_device(&ibmebus_bus_type, NULL, path,
+                             ibmebus_match_path);
+       if (dev) {
+               put_device(dev);
                printk(KERN_WARNING "%s: %s has already been probed\n",
                       __func__, path);
                rc = -EEXIST;
@@ -306,6 +313,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus,
        if ((dev = bus_find_device(&ibmebus_bus_type, NULL, path,
                                   ibmebus_match_path))) {
                of_device_unregister(to_platform_device(dev));
+               put_device(dev);
 
                kfree(path);
                return count;