diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-25 09:38:26 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-25 09:38:26 +0100 |
| commit | c1c58ada91cfe86f19d430282132434e620a1067 (patch) | |
| tree | cd12933040a65398e9779c3596f5109e37c206c3 /drivers/base/core.c | |
| parent | 67394f8f069c2fdf90f3b6d851824c07815442af (diff) | |
| parent | 2a24ab628aa7b190be32f63dfb6d96f3fb61580a (diff) | |
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'drivers/base/core.c')
| -rw-r--r-- | drivers/base/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index d21eb7744496..fbc223486f81 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -245,6 +245,7 @@ int device_add(struct device *dev) if ((error = kobject_add(&dev->kobj))) goto Error; + kobject_hotplug(&dev->kobj, KOBJ_ADD); if ((error = device_pm_add(dev))) goto PMError; if ((error = bus_add_device(dev))) @@ -257,14 +258,13 @@ int device_add(struct device *dev) /* notify platform of device entry */ if (platform_notify) platform_notify(dev); - - kobject_hotplug(&dev->kobj, KOBJ_ADD); Done: put_device(dev); return error; BusError: device_pm_remove(dev); PMError: + kobject_hotplug(&dev->kobj, KOBJ_REMOVE); kobject_del(&dev->kobj); Error: if (parent) |