From: Roel Kluin Date: Wed, 16 Dec 2009 00:46:23 +0000 (-0800) Subject: fbdev: TV_PALN bit set twice in sisfb_detect_VB_connect() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5ab948153a1e409afdc0f78a376ad3710df5b109;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git fbdev: TV_PALN bit set twice in sisfb_detect_VB_connect() The TV_PALN bit was tested twice, replace one by TV_PALM. Signed-off-by: Roel Kluin Cc: Thomas Winischhofer Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index a4e05e4d7501..9d2b6bc49036 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c @@ -2115,7 +2115,7 @@ sisfb_detect_VB_connect(struct sis_video_info *ivideo) if( (!(ivideo->vbflags2 & VB2_SISBRIDGE)) && (!((ivideo->sisvga_engine == SIS_315_VGA) && (ivideo->vbflags2 & VB2_CHRONTEL))) ) { - if(ivideo->sisfb_tvstd & (TV_PALN | TV_PALN | TV_NTSCJ)) { + if(ivideo->sisfb_tvstd & (TV_PALM | TV_PALN | TV_NTSCJ)) { ivideo->sisfb_tvstd = -1; printk(KERN_ERR "sisfb: PALM/PALN/NTSCJ not supported\n"); }