git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[pandora-kernel.git]
/
lib
/
kobject.c
diff --git
a/lib/kobject.c
b/lib/kobject.c
index
a181abe
..
7a0e680
100644
(file)
--- a/
lib/kobject.c
+++ b/
lib/kobject.c
@@
-207,7
+207,7
@@
int kobject_register(struct kobject * kobj)
kobject_name(kobj),error);
dump_stack();
} else
kobject_name(kobj),error);
dump_stack();
} else
- kobject_
hotplug
(kobj, KOBJ_ADD);
+ kobject_
uevent
(kobj, KOBJ_ADD);
} else
error = -EINVAL;
return error;
} else
error = -EINVAL;
return error;
@@
-312,7
+312,7
@@
void kobject_del(struct kobject * kobj)
void kobject_unregister(struct kobject * kobj)
{
pr_debug("kobject %s: unregistering\n",kobject_name(kobj));
void kobject_unregister(struct kobject * kobj)
{
pr_debug("kobject %s: unregistering\n",kobject_name(kobj));
- kobject_
hotplug
(kobj, KOBJ_REMOVE);
+ kobject_
uevent
(kobj, KOBJ_REMOVE);
kobject_del(kobj);
kobject_put(kobj);
}
kobject_del(kobj);
kobject_put(kobj);
}