From patchwork Fri Jan 22 07:54:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kusanagi Kouichi X-Patchwork-Id: 74489 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0M7tFA2026645 for ; Fri, 22 Jan 2010 07:55:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752191Ab0AVHyu (ORCPT ); Fri, 22 Jan 2010 02:54:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752179Ab0AVHyu (ORCPT ); Fri, 22 Jan 2010 02:54:50 -0500 Received: from msa103.auone-net.jp ([61.117.18.163]:36271 "EHLO msa103.auone-net.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073Ab0AVHyt (ORCPT ); Fri, 22 Jan 2010 02:54:49 -0500 Received: from ppp.dion.ne.jp (ZJ080201.ppp.dion.ne.jp [222.4.80.201]) by msa103.auone-net.jp (au one net msa) with ESMTP id B553714C03D; Fri, 22 Jan 2010 16:54:47 +0900 (JST) Date: Fri, 22 Jan 2010 16:54:46 +0900 From: Kusanagi Kouichi To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] cx25840: Fix composite detection. MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Message-Id: <20100122075447.B553714C03D@msa103.auone-net.jp> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index 385ecd5..764c811 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);