From 6cc49ca86318f03cd378997f3c54a7d98e61e50a Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Fri, 16 Nov 2007 11:57:28 -0500
Subject: [PATCH] --- yaml --- r: 75842 b: refs/heads/master c:
 ef2c51746dc89c2326ce522f8fb8a57695780e75 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/base/dd.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a95557f9cc95..6a9c3e54a5d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8e90d822bff3e0502d004facedb05859f98055f
+refs/heads/master: ef2c51746dc89c2326ce522f8fb8a57695780e75
diff --git a/trunk/drivers/base/dd.c b/trunk/drivers/base/dd.c
index 54922647522d..b0726eb6405e 100644
--- a/trunk/drivers/base/dd.c
+++ b/trunk/drivers/base/dd.c
@@ -289,11 +289,10 @@ static void __device_release_driver(struct device * dev)
 {
 	struct device_driver * drv;
 
-	drv = get_driver(dev->driver);
+	drv = dev->driver;
 	if (drv) {
 		driver_sysfs_remove(dev);
 		sysfs_remove_link(&dev->kobj, "driver");
-		klist_remove(&dev->knode_driver);
 
 		if (dev->bus)
 			blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
@@ -306,7 +305,7 @@ static void __device_release_driver(struct device * dev)
 			drv->remove(dev);
 		devres_release_all(dev);
 		dev->driver = NULL;
-		put_driver(drv);
+		klist_remove(&dev->knode_driver);
 	}
 }