From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 7 Nov 2014 19:26:15 +0000 (-0800)
Subject: Revert "driver core: Fix unbalanced device reference in drivers_probe"
X-Git-Tag: v3.19-rc1~77^2~44
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=f4c9485f9f5d816bb21333b517d0e3d2746dd285;p=karo-tx-linux.git

Revert "driver core: Fix unbalanced device reference in drivers_probe"

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>
---

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 876bae5ade33..83e910a57563 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -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)