From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 25 Jan 2011 09:55:01 +0000 (+0800)
Subject: rk29: do not call BUG when suspend/resume timeout temporarily
X-Git-Tag: firefly_0821_release~10785^2~12^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7991a0e366f2a7c9bb8cd14d2aa6437d0c6f9d4c;p=firefly-linux-kernel-4.4.55.git

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

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 0855a10337ee..82c15c393213 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -459,7 +459,9 @@ 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
 }
 
 /**