diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-12-15 19:46:23 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:20:01 -0500 |
commit | 5ab948153a1e409afdc0f78a376ad3710df5b109 (patch) | |
tree | 65b2e71c72663779f310e4cdb16f8e0e3ccc59f6 /drivers/video/sis | |
parent | 09335865c34c2e74c7ba0a2c7224e302e0f1a5d8 (diff) |
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 <roel.kluin@gmail.com>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/sis')
-rw-r--r-- | drivers/video/sis/sis_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
2115 | if( (!(ivideo->vbflags2 & VB2_SISBRIDGE)) && | 2115 | if( (!(ivideo->vbflags2 & VB2_SISBRIDGE)) && |
2116 | (!((ivideo->sisvga_engine == SIS_315_VGA) && | 2116 | (!((ivideo->sisvga_engine == SIS_315_VGA) && |
2117 | (ivideo->vbflags2 & VB2_CHRONTEL))) ) { | 2117 | (ivideo->vbflags2 & VB2_CHRONTEL))) ) { |
2118 | if(ivideo->sisfb_tvstd & (TV_PALN | TV_PALN | TV_NTSCJ)) { | 2118 | if(ivideo->sisfb_tvstd & (TV_PALM | TV_PALN | TV_NTSCJ)) { |
2119 | ivideo->sisfb_tvstd = -1; | 2119 | ivideo->sisfb_tvstd = -1; |
2120 | printk(KERN_ERR "sisfb: PALM/PALN/NTSCJ not supported\n"); | 2120 | printk(KERN_ERR "sisfb: PALM/PALN/NTSCJ not supported\n"); |
2121 | } | 2121 | } |