Revert "rk29: do not call BUG when suspend/resume timeout temporarily"

This reverts commit 7991a0e366f2a7c9bb8cd14d2aa6437d0c6f9d4c.

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 82c15c393213eb202e0c88b51bb6974e7fc6ebfe..0855a10337ee00f6b8d2c526d82d3c8695c7380a 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -459,9 +459,7 @@ static void dpm_drv_timeout(unsigned long data)
        printk(KERN_EMERG "dpm suspend stack:\n");
        show_stack(tsk, NULL);
 
-#ifndef CONFIG_ARCH_RK29
        BUG();
-#endif
 }
 
 /**