From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 14 Feb 2011 07:28:34 +0000 (+0800)
Subject: Revert "rk29: do not call BUG when suspend/resume timeout temporarily"
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d9d83f6565092c2c916efaefd3e8a6221f9b30ea;p=firefly-linux-kernel-4.4.55.git

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 82c15c393213..0855a10337ee 100644
--- 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
 }
 
 /**