1 files changed, 14 insertions, 4 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index ad7b50897bcc..36622b52e419 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1487,7 +1487,7 @@ class_dir_create_and_add(struct class *class, struct kobject *parent_kobj)
 
         dir = kzalloc(sizeof(*dir), GFP_KERNEL);
         if (!dir)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         dir->class = class;
         kobject_init(&dir->kobj, &class_dir_ktype);
@@ -1497,7 +1497,7 @@ class_dir_create_and_add(struct class *class, struct kobject *parent_kobj)
         retval = kobject_add(&dir->kobj, parent_kobj, "%s", class->name);
         if (retval < 0) {
                 kobject_put(&dir->kobj);
-                return NULL;
+                return ERR_PTR(retval);
         }
         return &dir->kobj;
 }
@@ -1804,6 +1804,10 @@ int device_add(struct device *dev)
 
         parent = get_device(dev->parent);
         kobj = get_device_parent(dev, parent);
+        if (IS_ERR(kobj)) {
+                error = PTR_ERR(kobj);
+                goto parent_error;
+        }
         if (kobj)
                 dev->kobj.parent = kobj;
 
@@ -1902,6 +1906,7 @@ done:
         kobject_del(&dev->kobj);
  Error:
         cleanup_glue_dir(dev, glue_dir);
+parent_error:
         put_device(parent);
 name_error:
         kfree(dev->p);
@@ -2426,7 +2431,7 @@ static void device_create_release(struct device *dev)
         kfree(dev);
 }
 
-static struct device *
+static __printf(6, 0) struct device *
 device_create_groups_vargs(struct class *class, struct device *parent,
                            dev_t devt, void *drvdata,
                            const struct attribute_group **groups,
@@ -2704,7 +2709,7 @@ static int device_move_class_links(struct device *dev,
 /**
  * device_move - moves a device to a new parent
  * @dev: the pointer to the struct device to be moved
- * @new_parent: the new parent of the device (can by NULL)
+ * @new_parent: the new parent of the device (can be NULL)
  * @dpm_order: how to reorder the dpm_list
  */
 int device_move(struct device *dev, struct device *new_parent,
@@ -2721,6 +2726,11 @@ int device_move(struct device *dev, struct device *new_parent,
         device_pm_lock();
         new_parent = get_device(new_parent);
         new_parent_kobj = get_device_parent(dev, new_parent);
+        if (IS_ERR(new_parent_kobj)) {
+                error = PTR_ERR(new_parent_kobj);
+                put_device(new_parent);
+                goto out;
+        }
 
         pr_debug("device: '%s': %s: moving to '%s'\n", dev_name(dev),
                  __func__, new_parent ? dev_name(new_parent) : "<NULL>");