openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] media: blackfin: bfin_capture: return -ENODATA for *dv_timings calls 

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>
Tested-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Lad, Prabhakar 2015-03-08 11:40:47 -03:00 committed by Mauro Carvalho Chehab
parent fe00b716e7
commit 116a6488d3
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/platform/blackfin/bfin_capture.c
View File

@ -487,6 +487,11 @@ static int bcap_enum_dv_timings(struct file *file, void *priv,
struct v4l2_enum_dv_timings *timings) struct v4l2_enum_dv_timings *timings)
{ {
struct bcap_device *bcap_dev = video_drvdata(file); 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; timings->pad = 0;
@ -498,6 +503,11 @@ static int bcap_query_dv_timings(struct file *file, void *priv,
struct v4l2_dv_timings *timings) struct v4l2_dv_timings *timings)
{ {
struct bcap_device *bcap_dev = video_drvdata(file); 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, return v4l2_subdev_call(bcap_dev->sd, video,
query_dv_timings, timings); 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 v4l2_dv_timings *timings)
{ {
struct bcap_device *bcap_dev = video_drvdata(file); 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; *timings = bcap_dev->dv_timings;
return 0; return 0;
@ -516,7 +531,13 @@ static int bcap_s_dv_timings(struct file *file, void *priv,
struct v4l2_dv_timings *timings) struct v4l2_dv_timings *timings)
{ {
struct bcap_device *bcap_dev = video_drvdata(file); struct bcap_device *bcap_dev = video_drvdata(file);
struct v4l2_input input;
int ret; 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)) if (vb2_is_busy(&bcap_dev->buffer_queue))
return -EBUSY; return -EBUSY;