summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-16 18:44:07 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-16 18:44:07 -0300
commit301884879d059388ef5331510d070e87c566a802 (patch)
treeb514070772b81d0d085ddfab3a1973b8e5436fa0
parent508cbb65d4cfc308d48577dc3e0b7accd3a179a1 (diff)
downloadmediapointer-dvb-s2-301884879d059388ef5331510d070e87c566a802.tar.gz
mediapointer-dvb-s2-301884879d059388ef5331510d070e87c566a802.tar.bz2
Fixed a trouble with other PAL standards
From: Mauro Carvalho Chehab <mchehab@infradead.org> 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>
-rw-r--r--linux/drivers/media/video/saa7115.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c
index 4cb8a1c63..a52c9b5d6 100644
--- a/linux/drivers/media/video/saa7115.c
+++ b/linux/drivers/media/video/saa7115.c
@@ -738,18 +738,14 @@ static void saa7115_set_v4lstd(struct i2c_client *client, v4l2_std_id std)
if (state->ident == V4L2_IDENT_SAA7113) {
u8 reg = saa7115_read(client, 0x0e) & 0x8f;
- if (std & V4L2_STD_PAL) {
- if (std == V4L2_STD_PAL_M) {
- reg|=0x30;
- } else if (std == V4L2_STD_PAL_N) {
- reg|=0x20;
- } else if (std == V4L2_STD_PAL_60) {
- reg|=0x10;
- }
- } else if (std & V4L2_STD_NTSC) {
- if (std == V4L2_STD_NTSC_M_JP) {
- reg|=0x40;
- }
+ if (std == V4L2_STD_PAL_M) {
+ reg|=0x30;
+ } else if (std == V4L2_STD_PAL_N) {
+ reg|=0x20;
+ } else if (std == V4L2_STD_PAL_60) {
+ reg|=0x10;
+ } else iif (std == V4L2_STD_NTSC_M_JP) {
+ reg|=0x40;
}
saa7115_write(client, 0x0e, reg);
}