Fix 3.3 merge error in: drivers: power: Add watchdog timer to catch drivers which lockup during suspend.

__device_suspend could return with an active timer on the stack

Change-Id: I113f5f9aa12f909cb46621b6744e02a104ddd2bd
Signed-off-by: Arve Hjønnevåg <arve@android.com>
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 070ef58..0d4212c 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -850,14 +850,6 @@
 
 	dpm_wait_for_children(dev, async);
 
-	data.dev = dev;
-	data.tsk = get_current();
-	init_timer_on_stack(&timer);
-	timer.expires = jiffies + HZ * 12;
-	timer.function = dpm_drv_timeout;
-	timer.data = (unsigned long)&data;
-	add_timer(&timer);
-
 	if (async_error)
 		return 0;
 
@@ -871,6 +863,14 @@
 		return 0;
 	}
 
+	data.dev = dev;
+	data.tsk = get_current();
+	init_timer_on_stack(&timer);
+	timer.expires = jiffies + HZ * 12;
+	timer.function = dpm_drv_timeout;
+	timer.data = (unsigned long)&data;
+	add_timer(&timer);
+
 	device_lock(dev);
 
 	if (dev->pm_domain) {