diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-16 22:44:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 17:53:44 +0100 |
| commit | 02c17224da6182d11cde34d57b27b93aaa7206cf (patch) | |
| tree | 37c07631c17f5c4ce2ed0dd0cb1f570e58de25cc /drivers/media/video/saa7115.c | |
| parent | V4L/DVB (3521): Avoid warnings at video-buf.c (diff) | |
| download | linux-02c17224da6182d11cde34d57b27b93aaa7206cf.tar.xz linux-02c17224da6182d11cde34d57b27b93aaa7206cf.zip | |
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 '')
| -rw-r--r-- | drivers/media/video/saa7115.c | 20 |
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) 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); } |