From 3f3f72aff2a1184d42f86ee2b18634d2025bf1f8 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Sat, 7 Jul 2012 08:51:03 +1000
Subject: [PATCH] --- yaml --- r: 319749 b: refs/heads/master c:
 17ffba6ad235cf9c21937ee1343df0d0fb2371fa h: refs/heads/master i:   319747:
 b593434b38832f4d5f6449b37f81082ba324f247 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mfd/twl-core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 309baeab2ed8..078385b72447 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5500e3964b8c154dc5af51ebcd7cd4df5d4abfee
+refs/heads/master: 17ffba6ad235cf9c21937ee1343df0d0fb2371fa
diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c
index 6fc90befa79e..b012efd29e01 100644
--- a/trunk/drivers/mfd/twl-core.c
+++ b/trunk/drivers/mfd/twl-core.c
@@ -568,7 +568,6 @@ add_numbered_child(unsigned chip, const char *name, int num,
 		goto err;
 	}
 
-	device_init_wakeup(&pdev->dev, can_wakeup);
 	pdev->dev.parent = &twl->client->dev;
 
 	if (pdata) {
@@ -593,6 +592,8 @@ add_numbered_child(unsigned chip, const char *name, int num,
 	}
 
 	status = platform_device_add(pdev);
+	if (status == 0)
+		device_init_wakeup(&pdev->dev, can_wakeup);
 
 err:
 	if (status < 0) {