aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2010-03-08 16:46:19 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-21 12:37:29 -0400
commitffa156590f98b750161757a16c37ac8e152a7859 (patch)
tree82ecca1adb3cafc886581d782ba1f46f714f5435 /drivers/base
parentfbb88fadf7dc2dd6d0d1aa88ff521b2f8552996a (diff)
Driver core: don't initialize wakeup flags
This patch (as1351) removes an unnecessary and unwanted assignment from device_initialize(). The wakeup flags are set to 0 along with everything else when the device structure is allocated, so we don't need to do it again. Furthermore, the subsystem might already have set these flags to their correct values; we don't want to override it. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index b56a0ba31d4a..e11c8c3e7416 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -562,7 +562,6 @@ void device_initialize(struct device *dev)
562 init_MUTEX(&dev->sem); 562 init_MUTEX(&dev->sem);
563 spin_lock_init(&dev->devres_lock); 563 spin_lock_init(&dev->devres_lock);
564 INIT_LIST_HEAD(&dev->devres_head); 564 INIT_LIST_HEAD(&dev->devres_head);
565 device_init_wakeup(dev, 0);
566 device_pm_init(dev); 565 device_pm_init(dev);
567 set_dev_node(dev, -1); 566 set_dev_node(dev, -1);
568} 567}