aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7115.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-16 16:44:07 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-21 11:53:44 -0500
commit02c17224da6182d11cde34d57b27b93aaa7206cf (patch)
tree37c07631c17f5c4ce2ed0dd0cb1f570e58de25cc /drivers/media/video/saa7115.c
parent9b89f2d301db6ad1fc716b70d9e26a38c958e7a5 (diff)
V4L/DVB (3522): Fixed a trouble with other PAL standards
V4L2_STD_PAL define is not correct. It specifies only 50Hz PAL standards. This patch fixes saa7113 color config for other PAL video standards. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7115.c')
-rw-r--r--drivers/media/video/saa7115.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 498d9aaec1e5..b184fd00b4e7 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -725,18 +725,14 @@ static void saa7115_set_v4lstd(struct i2c_client *client, v4l2_std_id std)
725 if (state->ident == V4L2_IDENT_SAA7113) { 725 if (state->ident == V4L2_IDENT_SAA7113) {
726 u8 reg = saa7115_read(client, 0x0e) & 0x8f; 726 u8 reg = saa7115_read(client, 0x0e) & 0x8f;
727 727
728 if (std & V4L2_STD_PAL) { 728 if (std == V4L2_STD_PAL_M) {
729 if (std == V4L2_STD_PAL_M) { 729 reg|=0x30;
730 reg|=0x30; 730 } else if (std == V4L2_STD_PAL_N) {
731 } else if (std == V4L2_STD_PAL_N) { 731 reg|=0x20;
732 reg|=0x20; 732 } else if (std == V4L2_STD_PAL_60) {
733 } else if (std == V4L2_STD_PAL_60) { 733 reg|=0x10;
734 reg|=0x10; 734 } else if (std == V4L2_STD_NTSC_M_JP) {
735 } 735 reg|=0x40;
736 } else if (std & V4L2_STD_NTSC) {
737 if (std == V4L2_STD_NTSC_M_JP) {
738 reg|=0x40;
739 }
740 } 736 }
741 saa7115_write(client, 0x0e, reg); 737 saa7115_write(client, 0x0e, reg);
742 } 738 }