---

yaml --- r: 318197 b: refs/heads/master c: 0998d06 h: refs/heads/master i: 318195: db2a764 v: v3
git-mirror · Jun 13, 2012 · 8e4c73c · 8e4c73c
1 parent 676813e
commit 8e4c73c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b02f8bede217a4b145ecc16d3940c78d83941147
+refs/heads/master: 0998d0631001288a5974afc0b2a5f568bcdecb4d
diff --git a/trunk/drivers/base/dd.c b/trunk/drivers/base/dd.c
@@ -283,6 +283,7 @@ static int really_probe(struct device *dev, struct device_driver *drv)
 	devres_release_all(dev);
 	driver_sysfs_remove(dev);
 	dev->driver = NULL;
+	dev_set_drvdata(dev, NULL);
 
 	if (ret == -EPROBE_DEFER) {
 		/* Driver requested deferred probing */
@@ -487,6 +488,7 @@ static void __device_release_driver(struct device *dev)
 			drv->remove(dev);
 		devres_release_all(dev);
 		dev->driver = NULL;
+		dev_set_drvdata(dev, NULL);
 		klist_remove(&dev->p->knode_driver);
 		if (dev->bus)
 			blocking_notifier_call_chain(&dev->bus->p->bus_notifier,