1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 24198ad01976..79848e6c5db5 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -820,7 +820,11 @@ int device_add(struct device *dev)
         error = dpm_sysfs_add(dev);
         if (error)
                 goto PMError;
-        device_pm_add(dev);
+        error = device_pm_add(dev);
+        if (error) {
+                dpm_sysfs_remove(dev);
+                goto PMError;
+        }
         error = bus_add_device(dev);
         if (error)
                 goto BusError;