From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
To: LMML <linux-media@vger.kernel.org>,
Scott Jiang <scott.jiang.linux@gmail.com>,
adi-buildroot-devel@lists.sourceforge.net
Cc: LKML <linux-kernel@vger.kernel.org>,
Mauro Carvalho Chehab <m.chehab@samsung.com>,
"Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Subject: [PATCH v2 10/15] media: blackfin: bfin_capture: return -ENODATA for *std calls
Date: Thu, 22 Jan 2015 22:18:43 +0000 [thread overview]
Message-ID: <1421965128-10470-11-git-send-email-prabhakar.csengg@gmail.com> (raw)
In-Reply-To: <1421965128-10470-1-git-send-email-prabhakar.csengg@gmail.com>
this patch adds supports to return -ENODATA to *_std calls
if the selected output does not support it.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
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;
--
2.1.0
next prev parent reply other threads:[~2015-01-22 22:25 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-22 22:18 [PATCH v2 00/15] media: blackfin: bfin_capture enhancements Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 01/15] media: blackfin: bfin_capture: drop buf_init() callback Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 02/15] media: blackfin: bfin_capture: release buffers in case start_streaming() call back fails Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 03/15] media: blackfin: bfin_capture: set min_buffers_needed Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 04/15] media: blackfin: bfin_capture: improve buf_prepare() callback Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 05/15] media: blackfin: bfin_capture: improve queue_setup() callback Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 06/15] media: blackfin: bfin_capture: use vb2_fop_mmap/poll Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 07/15] media: blackfin: bfin_capture: use v4l2_fh_open and vb2_fop_release Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 08/15] media: blackfin: bfin_capture: use vb2_ioctl_* helpers Lad, Prabhakar
2015-02-03 8:27 ` Scott Jiang
2015-02-03 8:31 ` Hans Verkuil
2015-01-22 22:18 ` [PATCH v2 09/15] media: blackfin: bfin_capture: make sure all buffers are returned on stop_streaming() callback Lad, Prabhakar
2015-01-22 22:18 ` Lad, Prabhakar [this message]
2015-01-22 22:18 ` [PATCH v2 11/15] media: blackfin: bfin_capture: return -ENODATA for *dv_timings calls Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 12/15] media: blackfin: bfin_capture: add support for vidioc_create_bufs Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 13/15] media: blackfin: bfin_capture: add support for VB2_DMABUF Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 14/15] media: blackfin: bfin_capture: add support for VIDIOC_EXPBUF Lad, Prabhakar
2015-01-22 22:18 ` [PATCH v2 15/15] media: blackfin: bfin_capture: set v4l2 buffer sequence Lad, Prabhakar
2015-01-30 15:49 ` [PATCH v2 00/15] media: blackfin: bfin_capture enhancements Lad, Prabhakar
2015-02-02 11:24 ` Hans Verkuil
2015-02-03 8:09 ` Scott Jiang
2015-02-16 11:42 ` Hans Verkuil
2015-02-18 22:49 ` Lad, Prabhakar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1421965128-10470-11-git-send-email-prabhakar.csengg@gmail.com \
--to=prabhakar.csengg@gmail.com \
--cc=adi-buildroot-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=scott.jiang.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®