openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Driver core: Fix cleanup when failing device_add(). 

Driver core: Fix cleanup when failing device_add().

 - Don't call cleanup_device_parent() if we didn't call setup_parent().
 - dev->kobj.parent may be NULL when cleanup_device_parent() is called,
   so we need to handle glue_dir == NULL in cleanup_glue_dir().

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Cornelia Huck 2008-02-27 15:38:23 +01:00 committed by Greg Kroah-Hartman
parent 135dee0cd0
commit c1fe539a7e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/base/core.c
View File

@ -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);
@ -773,7 +774,7 @@ int device_add(struct device *dev)
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__);