diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-10 18:00:11 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-13 10:25:51 -0500 |
commit | 7c95149b7f1f61201b12c73c4862a41bf2428961 (patch) | |
tree | 33917dbbd8b8cbbf917262e42baf3a528b752149 /drivers/base/power/wakeup.c | |
parent | a556d5b58345ccf51826b9ceac078072f830738b (diff) |
PM / Sleep: Initialize wakeup source locks in wakeup_source_add()
Initialize wakeup source locks in wakeup_source_add() instead of
wakeup_source_create(), because otherwise the locks of the wakeup
sources that haven't been allocated with wakeup_source_create()
aren't initialized and handled properly.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base/power/wakeup.c')
-rw-r--r-- | drivers/base/power/wakeup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index caf995fb774b..6e591a8a49da 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c | |||
@@ -64,7 +64,6 @@ struct wakeup_source *wakeup_source_create(const char *name) | |||
64 | if (!ws) | 64 | if (!ws) |
65 | return NULL; | 65 | return NULL; |
66 | 66 | ||
67 | spin_lock_init(&ws->lock); | ||
68 | if (name) | 67 | if (name) |
69 | ws->name = kstrdup(name, GFP_KERNEL); | 68 | ws->name = kstrdup(name, GFP_KERNEL); |
70 | 69 | ||
@@ -105,6 +104,7 @@ void wakeup_source_add(struct wakeup_source *ws) | |||
105 | if (WARN_ON(!ws)) | 104 | if (WARN_ON(!ws)) |
106 | return; | 105 | return; |
107 | 106 | ||
107 | spin_lock_init(&ws->lock); | ||
108 | setup_timer(&ws->timer, pm_wakeup_timer_fn, (unsigned long)ws); | 108 | setup_timer(&ws->timer, pm_wakeup_timer_fn, (unsigned long)ws); |
109 | ws->active = false; | 109 | ws->active = false; |
110 | 110 | ||