diff --git a/[refs] b/[refs]
index 16d7c4f45f69..d45768225f0a 100644
--- 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
index caf995fb774b..6e591a8a49da 100644
--- 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;