diff --git a/drivers/base/core.c b/drivers/base/core.c
index 10e027e92692..e6a7b93760e4 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -3428,6 +3428,7 @@ done:
 	device_pm_remove(dev);
 	dpm_sysfs_remove(dev);
  DPMError:
+	dev->driver = NULL;
 	bus_remove_device(dev);
  BusError:
 	device_remove_attrs(dev);