diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
| commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
| tree | 50c101806f4d3b6585222dda060559eb4f3e005a /lib/kobject.c | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index a181abed89f6..7a0e6809490d 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -207,7 +207,7 @@ int kobject_register(struct kobject * kobj) | |||
| 207 | kobject_name(kobj),error); | 207 | kobject_name(kobj),error); |
| 208 | dump_stack(); | 208 | dump_stack(); |
| 209 | } else | 209 | } else |
| 210 | kobject_hotplug(kobj, KOBJ_ADD); | 210 | kobject_uevent(kobj, KOBJ_ADD); |
| 211 | } else | 211 | } else |
| 212 | error = -EINVAL; | 212 | error = -EINVAL; |
| 213 | return error; | 213 | return error; |
| @@ -312,7 +312,7 @@ void kobject_del(struct kobject * kobj) | |||
| 312 | void kobject_unregister(struct kobject * kobj) | 312 | void kobject_unregister(struct kobject * kobj) |
| 313 | { | 313 | { |
| 314 | pr_debug("kobject %s: unregistering\n",kobject_name(kobj)); | 314 | pr_debug("kobject %s: unregistering\n",kobject_name(kobj)); |
| 315 | kobject_hotplug(kobj, KOBJ_REMOVE); | 315 | kobject_uevent(kobj, KOBJ_REMOVE); |
| 316 | kobject_del(kobj); | 316 | kobject_del(kobj); |
| 317 | kobject_put(kobj); | 317 | kobject_put(kobj); |
| 318 | } | 318 | } |
