From 8e4c73cd23b416c530015c99bbc4eba4546d8df3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 23 May 2012 00:09:34 +0200 Subject: [PATCH] --- yaml --- r: 318197 b: refs/heads/master c: 0998d0631001288a5974afc0b2a5f568bcdecb4d h: refs/heads/master i: 318195: db2a7643c44feaf50dc5b0f75b8496dfee6bc96e v: v3 --- [refs] | 2 +- trunk/drivers/base/dd.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4b812b037bbe..341931328298 100644 --- 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 index 1b1cbb571d38..9a1e9704d782 100644 --- 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,