projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c0e429f
)
rk29: do not call BUG when suspend/resume timeout temporarily
author
黄涛
<huangtao@rock-chips.com>
Tue, 25 Jan 2011 09:55:01 +0000
(17:55 +0800)
committer
黄涛
<huangtao@rock-chips.com>
Tue, 25 Jan 2011 12:08:13 +0000
(20:08 +0800)
drivers/base/power/main.c
patch
|
blob
|
history
diff --git
a/drivers/base/power/main.c
b/drivers/base/power/main.c
index 0855a10337ee00f6b8d2c526d82d3c8695c7380a..82c15c393213eb202e0c88b51bb6974e7fc6ebfe 100644
(file)
--- 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
}
/**