1 files changed, 3 insertions, 11 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 9c0070b5bd3e..7de543d1d0b4 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -621,7 +621,8 @@ static struct kobject *get_device_parent(struct device *dev,
 static void cleanup_glue_dir(struct device *dev, struct kobject *glue_dir)
 {
         /* see if we live in a "glue" directory */
-        if (!dev->class || glue_dir->kset != &dev->class->class_dirs)
+        if (!glue_dir || !dev->class ||
+            glue_dir->kset != &dev->class->class_dirs)
                 return;
 
         kobject_put(glue_dir);
@@ -770,17 +771,10 @@ int device_add(struct device *dev)
         struct class_interface *class_intf;
         int error;
 
-        error = pm_sleep_lock();
-        if (error) {
-                dev_warn(dev, "Suspicious %s during suspend\n", __FUNCTION__);
-                dump_stack();
-                return error;
-        }
-
         dev = get_device(dev);
         if (!dev || !strlen(dev->bus_id)) {
                 error = -EINVAL;
-                goto Error;
+                goto Done;
         }
 
         pr_debug("device: '%s': %s\n", dev->bus_id, __FUNCTION__);
@@ -843,11 +837,9 @@ int device_add(struct device *dev)
         }
  Done:
         put_device(dev);
-        pm_sleep_unlock();
         return error;
  BusError:
         device_pm_remove(dev);
-        dpm_sysfs_remove(dev);
  PMError:
         if (dev->bus)
                 blocking_notifier_call_chain(&dev->bus->p->bus_notifier,