diff options
| author | Kusanagi Kouichi <slash@ac.auone-net.jp> | 2010-01-22 04:54:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 15:10:50 -0300 |
| commit | 10e43d90da572f088f15cadfb5cc83cd762041c3 (patch) | |
| tree | c0085b2ac7c65424b7007b97c80954365a372758 /drivers/media/video/cx25840 | |
| parent | 55461f4c584e812bb8e19c3fb1924edd512ea74c (diff) | |
| download | linux-10e43d90da572f088f15cadfb5cc83cd762041c3.tar.gz linux-10e43d90da572f088f15cadfb5cc83cd762041c3.tar.bz2 linux-10e43d90da572f088f15cadfb5cc83cd762041c3.zip | |
V4L/DVB: cx25840: Fix composite detection
If CX25840_VIN1_CH1 and the like is used, input is not detected as composite.
Their value is 0x800000XX and CX25840_COMPONENT_ON is 0x80000200. So
739 else if ((vid_input & CX25840_COMPONENT_ON) == 0)
this condition never be true.
Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
Reviewed-by: Andy Walls <awalls@radix.net>
Acked-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx25840')
| -rw-r--r-- | drivers/media/video/cx25840/cx25840-core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index 796f12d59daa..f2461cd3de5a 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c @@ -734,10 +734,8 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp v4l_dbg(1, cx25840_debug, client, "vid_input 0x%x\n", vid_input); reg = vid_input & 0xff; - if ((vid_input & CX25840_SVIDEO_ON) == CX25840_SVIDEO_ON) - is_composite = 0; - else if ((vid_input & CX25840_COMPONENT_ON) == 0) - is_composite = 1; + is_composite = !is_component && + ((vid_input & CX25840_SVIDEO_ON) != CX25840_SVIDEO_ON); v4l_dbg(1, cx25840_debug, client, "mux cfg 0x%x comp=%d\n", reg, is_composite); |