From: Lad Prabhakar <prabhakar.csengg@gmail.com>
To: Scott Jiang <scott.jiang.linux@gmail.com>,
linux-media@vger.kernel.org, Hans Verkuil <hverkuil@xs4all.nl>
Cc: adi-buildroot-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org, "Lad,
Prabhakar" <prabhakar.csengg@gmail.com>
Subject: [PATCH v4 11/17] media: blackfin: bfin_capture: return -ENODATA for *dv_timings calls
Date: Sun, 8 Mar 2015 14:40:47 +0000 [thread overview]
Message-ID: <1425825653-14768-12-git-send-email-prabhakar.csengg@gmail.com> (raw)
In-Reply-To: <1425825653-14768-1-git-send-email-prabhakar.csengg@gmail.com>
From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
this patch adds support to return -ENODATA for *dv_timings calls
if the current output does not support it.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Scott Jiang <scott.jiang.linux@gmail.com>
Tested-by: Scott Jiang <scott.jiang.linux@gmail.com>
---
drivers/media/platform/blackfin/bfin_capture.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
index f97d94d..2dead84 100644
--- a/drivers/media/platform/blackfin/bfin_capture.c
+++ b/drivers/media/platform/blackfin/bfin_capture.c
@@ -487,6 +487,11 @@ static int bcap_enum_dv_timings(struct file *file, void *priv,
struct v4l2_enum_dv_timings *timings)
{
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_DV_TIMINGS))
+ return -ENODATA;
timings->pad = 0;
@@ -498,6 +503,11 @@ static int bcap_query_dv_timings(struct file *file, void *priv,
struct v4l2_dv_timings *timings)
{
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_DV_TIMINGS))
+ return -ENODATA;
return v4l2_subdev_call(bcap_dev->sd, video,
query_dv_timings, timings);
@@ -507,6 +517,11 @@ static int bcap_g_dv_timings(struct file *file, void *priv,
struct v4l2_dv_timings *timings)
{
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_DV_TIMINGS))
+ return -ENODATA;
*timings = bcap_dev->dv_timings;
return 0;
@@ -516,7 +531,13 @@ static int bcap_s_dv_timings(struct file *file, void *priv,
struct v4l2_dv_timings *timings)
{
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_DV_TIMINGS))
+ return -ENODATA;
+
if (vb2_is_busy(&bcap_dev->buffer_queue))
return -EBUSY;
--
2.1.0
next prev parent reply other threads:[~2015-03-08 14:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-08 14:40 [PATCH v4 00/17] media: blackfin: bfin_capture enhancements Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 01/17] media: blackfin: bfin_capture: drop buf_init() callback Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 02/17] media: blackfin: bfin_capture: release buffers in case start_streaming() call back fails Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 03/17] media: blackfin: bfin_capture: set min_buffers_needed Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 04/17] media: blackfin: bfin_capture: set vb2 buffer field Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 05/17] media: blackfin: bfin_capture: improve queue_setup() callback Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 06/17] media: blackfin: bfin_capture: use vb2_fop_mmap/poll Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 07/17] media: blackfin: bfin_capture: use v4l2_fh_open and vb2_fop_release Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 08/17] media: blackfin: bfin_capture: use vb2_ioctl_* helpers Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 09/17] media: blackfin: bfin_capture: make sure all buffers are returned on stop_streaming() callback Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 10/17] media: blackfin: bfin_capture: return -ENODATA for *std calls Lad Prabhakar
2015-03-08 14:40 ` Lad Prabhakar [this message]
2015-03-08 14:40 ` [PATCH v4 12/17] media: blackfin: bfin_capture: add support for vidioc_create_bufs Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 13/17] media: blackfin: bfin_capture: add support for VB2_DMABUF Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 14/17] media: blackfin: bfin_capture: add support for VIDIOC_EXPBUF Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 15/17] media: blackfin: bfin_capture: set v4l2 buffer sequence Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 16/17] media: blackfin: bfin_capture: drop bcap_get_unmapped_area() Lad Prabhakar
2015-03-08 14:40 ` [PATCH v4 17/17] media: blackfin: bfin_capture: embed video_device struct in bcap_device Lad Prabhakar
2015-03-26 9:18 ` [PATCH v4 00/17] media: blackfin: bfin_capture enhancements Scott Jiang
2015-04-02 13:20 ` Hans Verkuil
2015-04-10 10:42 ` Scott Jiang
2015-04-24 10:04 ` Hans Verkuil
2015-05-05 9:58 ` Scott Jiang
2015-05-05 10:13 ` 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=1425825653-14768-12-git-send-email-prabhakar.csengg@gmail.com \
--to=prabhakar.csengg@gmail.com \
--cc=adi-buildroot-devel@lists.sourceforge.net \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--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®