projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled.
[powerpc.git]
/
lib
/
kobject.c
diff --git
a/lib/kobject.c
b/lib/kobject.c
index
b46350c
..
7dd5c0e
100644
(file)
--- a/
lib/kobject.c
+++ b/
lib/kobject.c
@@
-119,6
+119,7
@@
char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask)
return path;
}
return path;
}
+EXPORT_SYMBOL_GPL(kobject_get_path);
/**
* kobject_init - initialize object.
/**
* kobject_init - initialize object.
@@
-205,7
+206,7
@@
int kobject_add(struct kobject * kobj)
else
printk("kobject_add failed for %s (%d)\n",
kobject_name(kobj), error);
else
printk("kobject_add failed for %s (%d)\n",
kobject_name(kobj), error);
- dump_stack();
+
dump_stack();
}
return error;
}
return error;
@@
-407,6
+408,7
@@
static struct kobj_type dir_ktype = {
struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
{
struct kobject *k;
struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
{
struct kobject *k;
+ int ret;
if (!parent)
return NULL;
if (!parent)
return NULL;
@@
-418,7
+420,13
@@
struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
k->parent = parent;
k->ktype = &dir_ktype;
kobject_set_name(k, name);
k->parent = parent;
k->ktype = &dir_ktype;
kobject_set_name(k, name);
- kobject_register(k);
+ ret = kobject_register(k);
+ if (ret < 0) {
+ printk(KERN_WARNING "kobject_add_dir: "
+ "kobject_register error: %d\n", ret);
+ kobject_del(k);
+ return NULL;
+ }
return k;
}
return k;
}