---

yaml --- r: 291851 b: refs/heads/master c: 7c95149 h: refs/heads/master i: 291849: 1eb4775 291847: 04e0145 v: v3
git-mirror · Feb 13, 2012 · 8d290b6 · 8d290b6
1 parent 9f93319
commit 8d290b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a556d5b58345ccf51826b9ceac078072f830738b
+refs/heads/master: 7c95149b7f1f61201b12c73c4862a41bf2428961
diff --git a/trunk/drivers/base/power/wakeup.c b/trunk/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;