From patchwork Thu Jan 22 22:18:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 5689211 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 39DC7C058D for ; Thu, 22 Jan 2015 22:25:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7BF7F20270 for ; Thu, 22 Jan 2015 22:25:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94D312026D for ; Thu, 22 Jan 2015 22:25:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753663AbbAVWZG (ORCPT ); Thu, 22 Jan 2015 17:25:06 -0500 Received: from mail-wg0-f52.google.com ([74.125.82.52]:41974 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753928AbbAVWU5 (ORCPT ); Thu, 22 Jan 2015 17:20:57 -0500 Received: by mail-wg0-f52.google.com with SMTP id y19so4319651wgg.11; Thu, 22 Jan 2015 14:20:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mxnHaiWxEirKEtpBEnj4UuYGdaphn6fB3Ap5D9M43Ng=; b=Olc0sll8yIQ0VTmM0x7d/xkZztg/AxKxPVmxsjLP6EP7lHZt9GBEvRIPXlla072Jw2 lMRIWAh+BDY2TXqXsl8jC5qVoKy7i5BuAPqTmm9OLxY6GeQF+wZt/2PurkrZ3aU5QzvO xDsCRkEIXVvIMhP0tjL1KIQ9qUyDTW0YcKyPE2ygiJ5SBWyFZylQEPm8ifi7DMsgXWuC b/RsE8ZnS29XShwxHn/uXCVPqM60fYloAq8OCRMR9Tl0t9jcnMtop1WsoCK25uUEnBoq uWLBvNnFXAIl8q1Mb1YRaZ6W8M8+iIXeVJ49zixrtNloBlcTDxnrDnK9SN1qFx9z8CYv 4+Ww== X-Received: by 10.180.206.14 with SMTP id lk14mr32343681wic.71.1421965256268; Thu, 22 Jan 2015 14:20:56 -0800 (PST) Received: from tango-charlie.Home ([2.218.173.171]) by mx.google.com with ESMTPSA id fi10sm4757888wib.13.2015.01.22.14.20.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jan 2015 14:20:55 -0800 (PST) From: "Lad, Prabhakar" To: LMML , Scott Jiang , adi-buildroot-devel@lists.sourceforge.net Cc: LKML , Mauro Carvalho Chehab , "Lad, Prabhakar" Subject: [PATCH v2 10/15] media: blackfin: bfin_capture: return -ENODATA for *std calls Date: Thu, 22 Jan 2015 22:18:43 +0000 Message-Id: <1421965128-10470-11-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1421965128-10470-1-git-send-email-prabhakar.csengg@gmail.com> References: <1421965128-10470-1-git-send-email-prabhakar.csengg@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP this patch adds supports to return -ENODATA to *_std calls if the selected output does not support it. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/blackfin/bfin_capture.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index 57f3b8c..6b38e63 100644 --- a/drivers/media/platform/blackfin/bfin_capture.c +++ b/drivers/media/platform/blackfin/bfin_capture.c @@ -441,6 +441,11 @@ static irqreturn_t bcap_isr(int irq, void *dev_id) static int bcap_querystd(struct file *file, void *priv, v4l2_std_id *std) { struct bcap_device *bcap_dev = video_drvdata(file); + struct v4l2_input input; + + input = bcap_dev->cfg->inputs[bcap_dev->cur_input]; + if (!(input.capabilities & V4L2_IN_CAP_STD)) + return -ENODATA; return v4l2_subdev_call(bcap_dev->sd, video, querystd, std); } @@ -448,6 +453,11 @@ static int bcap_querystd(struct file *file, void *priv, v4l2_std_id *std) static int bcap_g_std(struct file *file, void *priv, v4l2_std_id *std) { struct bcap_device *bcap_dev = video_drvdata(file); + struct v4l2_input input; + + input = bcap_dev->cfg->inputs[bcap_dev->cur_input]; + if (!(input.capabilities & V4L2_IN_CAP_STD)) + return -ENODATA; *std = bcap_dev->std; return 0; @@ -456,8 +466,13 @@ static int bcap_g_std(struct file *file, void *priv, v4l2_std_id *std) static int bcap_s_std(struct file *file, void *priv, v4l2_std_id std) { struct bcap_device *bcap_dev = video_drvdata(file); + struct v4l2_input input; int ret; + input = bcap_dev->cfg->inputs[bcap_dev->cur_input]; + if (!(input.capabilities & V4L2_IN_CAP_STD)) + return -ENODATA; + if (vb2_is_busy(&bcap_dev->buffer_queue)) return -EBUSY;