projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
pxafb.c
diff --git
a/drivers/video/pxafb.c
b/drivers/video/pxafb.c
index a2e5b5100ab4edd8a8756905a0fbeefdd4091c4f..0f4e8c942f9e082e7410de7983ac28f81576c5f3 100644
(file)
--- a/
drivers/video/pxafb.c
+++ b/
drivers/video/pxafb.c
@@
-1648,7
+1648,9
@@
pxafb_freq_transition(struct notifier_block *nb, unsigned long val, void *data)
switch (val) {
case CPUFREQ_PRECHANGE:
- if (!fbi->overlay[0].usage && !fbi->overlay[1].usage)
+#ifdef CONFIG_FB_PXA_OVERLAY
+ if (!(fbi->overlay[0].usage || fbi->overlay[1].usage))
+#endif
set_ctrlr_state(fbi, C_DISABLE_CLKCHANGE);
break;