aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/core.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org.(none)>2005-04-19 16:14:28 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org.(none)>2005-04-19 16:14:28 -0400
commit9f6c6fc505560465be0964eb4da1b6ca97bd3951 (patch)
tree9660991b5e417ad7bb74e105c037ff358f60ba27 /drivers/base/core.c
parentc3c661932cd53582c5b03692b99649300977248a (diff)
parentf0e035f4b6940aae6836500b642029c289ed4535 (diff)
Merge with kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
for 13 driver core, sysfs, and debugfs fixes.
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r--drivers/base/core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 4e6cce8e6d35..a7cedd8cefe5 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -260,6 +260,8 @@ int device_add(struct device *dev)
260 /* notify platform of device entry */ 260 /* notify platform of device entry */
261 if (platform_notify) 261 if (platform_notify)
262 platform_notify(dev); 262 platform_notify(dev);
263
264 kobject_hotplug(&dev->kobj, KOBJ_ADD);
263 Done: 265 Done:
264 put_device(dev); 266 put_device(dev);
265 return error; 267 return error;
@@ -349,6 +351,7 @@ void device_del(struct device * dev)
349 platform_notify_remove(dev); 351 platform_notify_remove(dev);
350 bus_remove_device(dev); 352 bus_remove_device(dev);
351 device_pm_remove(dev); 353 device_pm_remove(dev);
354 kobject_hotplug(&dev->kobj, KOBJ_REMOVE);
352 kobject_del(&dev->kobj); 355 kobject_del(&dev->kobj);
353 if (parent) 356 if (parent)
354 put_device(parent); 357 put_device(parent);