From e1dbabdee8f7f634c0802c4d32db8e450f9a964b Mon Sep 17 00:00:00 2001 From: Kusanagi Kouichi Date: Fri, 22 Jan 2010 04:54:46 -0300 Subject: [PATCH] --- yaml --- r: 181610 b: refs/heads/master c: 10e43d90da572f088f15cadfb5cc83cd762041c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx25840/cx25840-core.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f67ee9679b9e..7aecb83799fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55461f4c584e812bb8e19c3fb1924edd512ea74c +refs/heads/master: 10e43d90da572f088f15cadfb5cc83cd762041c3 diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c index 796f12d59daa..f2461cd3de5a 100644 --- a/trunk/drivers/media/video/cx25840/cx25840-core.c +++ b/trunk/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);