From 4d3678e6df8d93d56d8740af704dfafc7e0d1040 Mon Sep 17 00:00:00 2001
From: "Moore, Eric" <Eric.Moore@lsil.com>
Date: Tue, 14 Mar 2006 09:18:18 -0700
Subject: [PATCH] --- yaml --- r: 22634 b: refs/heads/master c:
 e935d5da8e5d12fabe5b632736c50eae0427e8c8 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/base/bus.c     | 22 ++++++++++++++++++++++
 trunk/include/linux/device.h |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6f05bea09989..6d4d03f4ce5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79cb1819e231f811211133a09a5382cb89d7ec67
+refs/heads/master: e935d5da8e5d12fabe5b632736c50eae0427e8c8
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index c3141565d59d..48718b7f4fa0 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/drivers/base/bus.c
@@ -536,6 +536,28 @@ void bus_rescan_devices(struct bus_type * bus)
 	bus_for_each_dev(bus, NULL, NULL, bus_rescan_devices_helper);
 }
 
+/**
+ * device_reprobe - remove driver for a device and probe for a new driver
+ * @dev: the device to reprobe
+ *
+ * This function detaches the attached driver (if any) for the given
+ * device and restarts the driver probing process.  It is intended
+ * to use if probing criteria changed during a devices lifetime and
+ * driver attachment should change accordingly.
+ */
+void device_reprobe(struct device *dev)
+{
+	if (dev->driver) {
+		if (dev->parent)        /* Needed for USB */
+			down(&dev->parent->sem);
+		device_release_driver(dev);
+		if (dev->parent)
+			up(&dev->parent->sem);
+	}
+
+	bus_rescan_devices_helper(dev, NULL);
+}
+EXPORT_SYMBOL_GPL(device_reprobe);
 
 struct bus_type * get_bus(struct bus_type * bus)
 {
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
index 58df18d9cd3e..e8ac5bcfbec7 100644
--- a/trunk/include/linux/device.h
+++ b/trunk/include/linux/device.h
@@ -378,6 +378,7 @@ extern void device_bind_driver(struct device * dev);
 extern void device_release_driver(struct device * dev);
 extern int  device_attach(struct device * dev);
 extern void driver_attach(struct device_driver * drv);
+extern void device_reprobe(struct device *dev);
 
 
 /*