p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] media: davinci: vpif_display: return -ENODATA for *std calls 

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>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Lad, Prabhakar 2014-05-16 10:33:28 -03:00 committed by Mauro Carvalho Chehab
parent 1093c5905d
commit f27d0f459f
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/media/platform/davinci/vpif_display.c
View File

@ -715,14 +715,26 @@ static int vpif_try_fmt_vid_out(struct file *file, void *priv,
static int vpif_s_std(struct file *file, void *priv, v4l2_std_id std_id)
{
struct vpif_display_config *config = vpif_dev->platform_data;
struct video_device *vdev = video_devdata(file);
struct channel_obj *ch = video_get_drvdata(vdev);
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
int ret = 0;
struct vpif_display_chan_config *chan_cfg;
struct v4l2_output output;
int ret;
if (config->chan_config[ch->channel_id].outputs == NULL)
return -ENODATA;
chan_cfg = &config->chan_config[ch->channel_id];
output = chan_cfg->outputs[ch->output_idx].output;
if (output.capabilities != V4L2_OUT_CAP_STD)
return -ENODATA;
if (vb2_is_busy(&common->buffer_queue))
return -EBUSY;
if (!(std_id & VPIF_V4L2_STD))
return -EINVAL;
@ -754,8 +766,19 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id std_id)
static int vpif_g_std(struct file *file, void *priv, v4l2_std_id *std)
{
struct vpif_display_config *config = vpif_dev->platform_data;
struct video_device *vdev = video_devdata(file);
struct channel_obj *ch = video_get_drvdata(vdev);
struct vpif_display_chan_config *chan_cfg;
struct v4l2_output output;
if (config->chan_config[ch->channel_id].outputs == NULL)
return -ENODATA;
chan_cfg = &config->chan_config[ch->channel_id];
output = chan_cfg->outputs[ch->output_idx].output;
if (output.capabilities != V4L2_OUT_CAP_STD)
return -ENODATA;
*std = ch->video.stdid;
return 0;