1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index b5bf243d9cd6..6a48824e43ff 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -112,6 +112,7 @@ static int really_probe(void *void_data)
         atomic_inc(&probe_count);
         pr_debug("%s: Probing driver %s with device %s\n",
                  drv->bus->name, drv->name, dev->bus_id);
+        WARN_ON(!list_empty(&dev->devres_head));
 
         dev->driver = drv;
         if (driver_sysfs_add(dev)) {
@@ -137,6 +138,7 @@ static int really_probe(void *void_data)
         goto done;
 
 probe_failed:
+        devres_release_all(dev);
         driver_sysfs_remove(dev);
         dev->driver = NULL;
 
@@ -327,6 +329,7 @@ static void __device_release_driver(struct device * dev)
                         dev->bus->remove(dev);
                 else if (drv->remove)
                         drv->remove(dev);
+                devres_release_all(dev);
                 dev->driver = NULL;
                 put_driver(drv);
         }