From d7c5f9841c07eddeb2e3ac61adadbfc3b30d3814 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 24 May 2005 18:08:07 -0700 Subject: [PATCH] --- yaml --- r: 1404 b: refs/heads/master c: 6df16d0c35b9c0d3627f30c106e6142d3d12662b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/core.c | 4 ++-- trunk/include/linux/wait.h | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 10271a08561b..26c667bbbd33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 816242da3735957bee99aeba40aa60c4f120a101 +refs/heads/master: 6df16d0c35b9c0d3627f30c106e6142d3d12662b diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c index d21eb7744496..fbc223486f81 100644 --- a/trunk/drivers/base/core.c +++ b/trunk/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) diff --git a/trunk/include/linux/wait.h b/trunk/include/linux/wait.h index 17c874a8eb3f..c9486c3efb4a 100644 --- a/trunk/include/linux/wait.h +++ b/trunk/include/linux/wait.h @@ -386,9 +386,7 @@ int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key); wait_queue_t name = { \ .task = current, \ .func = autoremove_wake_function, \ - .task_list = { .next = &(name).task_list, \ - .prev = &(name).task_list, \ - }, \ + .task_list = LIST_HEAD_INIT((name).task_list), \ } #define DEFINE_WAIT_BIT(name, word, bit) \