diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:48:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:48:33 -0300 |
| commit | 2fc74336805f6956eb1b58852adf962315899b82 (patch) | |
| tree | e327913ed114c1d34f7d6450abbb61834cae9d5d /linux/drivers/media/video | |
| parent | d30a31decd05aa55764418cce0b9cce695885439 (diff) | |
| parent | ba6db43dd8d3f7fa51679331c85c2c64c848e8db (diff) | |
| download | mediapointer-dvb-s2-2fc74336805f6956eb1b58852adf962315899b82.tar.gz mediapointer-dvb-s2-2fc74336805f6956eb1b58852adf962315899b82.tar.bz2 | |
Merge from mkrufky tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/saa7115.c | 20 |
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..4f70190ca 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 if (std == V4L2_STD_NTSC_M_JP) { + reg|=0x40; } saa7115_write(client, 0x0e, reg); } |