Revert "driver core: Fix unbalanced device reference in drivers_probe"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Nov 2014 19:26:15 +0000 (11:26 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Nov 2014 19:26:15 +0000 (11:26 -0800)
This reverts commit bb34cb6bbd287b57e955bc5cfd42fcde6aaca279.

Wrong patch for the wrong branch, sorry for the noise...

Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/bus.c

index 876bae5..83e910a 100644 (file)
@@ -254,15 +254,13 @@ static ssize_t store_drivers_probe(struct bus_type *bus,
                                   const char *buf, size_t count)
 {
        struct device *dev;
-       int err = -EINVAL;
 
        dev = bus_find_device_by_name(bus, NULL, buf);
        if (!dev)
                return -ENODEV;
-       if (bus_rescan_devices_helper(dev, NULL) == 0)
-               err = count;
-       put_device(dev);
-       return err;
+       if (bus_rescan_devices_helper(dev, NULL) != 0)
+               return -EINVAL;
+       return count;
 }
 
 static struct device *next_device(struct klist_iter *i)