diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-11 00:00:11 +0100 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2012-03-16 18:10:25 -0700 |
| commit | 3c63797031913f63fe31671d6de47014f00af415 (patch) | |
| tree | 6686fcafaa60fa96c60acc622c1fc063d01b453b /drivers/base/power | |
| parent | 10c41e43e1703e11ebbf4707af3174850163024b (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')
| -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) if (!ws) return NULL; - spin_lock_init(&ws->lock); if (name) ws->name = kstrdup(name, GFP_KERNEL); @@ -105,6 +104,7 @@ void wakeup_source_add(struct wakeup_source *ws) if (WARN_ON(!ws)) return; + spin_lock_init(&ws->lock); setup_timer(&ws->timer, pm_wakeup_timer_fn, (unsigned long)ws); ws->active = false; |