From patchwork Fri Dec 16 08:00:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 8860 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RbSiz-0004Bu-3A; Fri, 16 Dec 2011 09:01:25 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1RbSiy-0000A5-Dd; Fri, 16 Dec 2011 09:01:00 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756365Ab1LPIA6 (ORCPT + 4 others); Fri, 16 Dec 2011 03:00:58 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:58875 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756346Ab1LPIA5 (ORCPT ); Fri, 16 Dec 2011 03:00:57 -0500 Received: by wgbdr13 with SMTP id dr13so5726309wgb.1 for ; Fri, 16 Dec 2011 00:00:56 -0800 (PST) Received: by 10.227.59.203 with SMTP id m11mr4866464wbh.18.1324022456465; Fri, 16 Dec 2011 00:00:56 -0800 (PST) Received: from localhost.localdomain (128.50.18.95.dynamic.jazztel.es. [95.18.50.128]) by mx.google.com with ESMTPS id ff1sm13385195wbb.5.2011.12.16.00.00.52 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Dec 2011 00:00:53 -0800 (PST) From: Javier Martin To: linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de, saaguirre@ti.com, mchehab@infradead.org, Javier Martin Subject: [PATCH] V4L: soc-camera: provide support for S_INPUT. Date: Fri, 16 Dec 2011 09:00:43 +0100 Message-Id: <1324022443-5967-1-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.12.16.75414 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: -1.9 (-) X-LSpam-Report: No, score=-1.9 required=5.0 tests=BAYES_00=-1.9 autolearn=ham Some v4l-subdevs such as tvp5150 have multiple inputs. This patch allows the user of a soc-camera device to select between them. Signed-off-by: Javier Martin --- drivers/media/video/soc_camera.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index b72580c..1cea1a9 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -235,10 +235,10 @@ static int soc_camera_g_input(struct file *file, void *priv, unsigned int *i) static int soc_camera_s_input(struct file *file, void *priv, unsigned int i) { - if (i > 0) - return -EINVAL; + struct soc_camera_device *icd = file->private_data; + struct v4l2_subdev *sd = soc_camera_to_subdev(icd); - return 0; + return v4l2_subdev_call(sd, video, s_routing, i, 0, 0); } static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a)