Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: pxafb: Fix access to nonexistent member of pxafb_info

In case CONFIG_FB_PXA_OVERLAY is not defined, the pxafb_freq_transition()
function tests nonexistent member of pxafb_info (since the member is not
part of the structure).

Fix this by wraping the test in ifdef, even if I don't really like how the code
looks now. The check doesn't have to happen if overlays are disabled at all as
the check is always true then.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

authored by

Marek Vasut and committed by
Eric Miao
a6d710fe a6360dd3

+3 -1
+3 -1
drivers/video/pxafb.c
··· 1648 1648 1649 1649 switch (val) { 1650 1650 case CPUFREQ_PRECHANGE: 1651 - if (!fbi->overlay[0].usage && !fbi->overlay[1].usage) 1651 + #ifdef CONFIG_FB_PXA_OVERLAY 1652 + if (!(fbi->overlay[0].usage || fbi->overlay[1].usage)) 1653 + #endif 1652 1654 set_ctrlr_state(fbi, C_DISABLE_CLKCHANGE); 1653 1655 break; 1654 1656