From patchwork Sat Oct 9 04:31:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 243031 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o994Vill012682 for ; Sat, 9 Oct 2010 04:31:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751132Ab0JIEbm (ORCPT ); Sat, 9 Oct 2010 00:31:42 -0400 Received: from utopia.booyaka.com ([72.9.107.138]:53528 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750809Ab0JIEbl (ORCPT ); Sat, 9 Oct 2010 00:31:41 -0400 Received: (qmail 9370 invoked by uid 526); 9 Oct 2010 04:31:41 -0000 Date: Fri, 8 Oct 2010 22:31:40 -0600 (MDT) From: Paul Walmsley To: Hans Verkuil , Mauro Carvalho Chehab , mchehab@infradead.org, linux-media@vger.kernel.org Subject: [PATCH] V4L/DVB: tvp5150: COMPOSITE0 input should not force-enable TV mode Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 09 Oct 2010 04:31:44 +0000 (UTC) diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 1654f65..e4dfb67 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c @@ -277,7 +277,7 @@ static int tvp5150_log_status(struct v4l2_subdev *sd) static inline void tvp5150_selmux(struct v4l2_subdev *sd) { - int opmode=0; + int opmode = 0; struct tvp5150 *decoder = to_tvp5150(sd); int input = 0; unsigned char val; @@ -290,12 +290,10 @@ static inline void tvp5150_selmux(struct v4l2_subdev *sd) input |= 2; /* fall through */ case TVP5150_COMPOSITE0: - opmode=0x30; /* TV Mode */ break; case TVP5150_SVIDEO: default: input |= 1; - opmode=0; /* Auto Mode */ break; }