---

yaml --- r: 75842 b: refs/heads/master c: ef2c517 h: refs/heads/master v: v3
git-mirror · Jan 25, 2008 · 6cc49ca · 6cc49ca
1 parent d7a3b9e
commit 6cc49ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);
 	}
 }