diff --git a/drivers/base/core.c b/drivers/base/core.c
index a3e14143ec0c..506289e6b04d 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -3513,6 +3513,7 @@ int device_add(struct device *dev)
 	device_pm_remove(dev);
 	dpm_sysfs_remove(dev);
  DPMError:
+	dev->driver = NULL;
 	bus_remove_device(dev);
  BusError:
 	device_remove_attrs(dev);