summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil2019-01-11 12:37:03 +0100
committerMauro Carvalho Chehab2019-01-16 19:43:16 +0100
commit3f122df4a2ba6704ccf51f5caec583443514644f (patch)
tree2fb417ec3729965e67216cff0e69b43504a52762
parentmedia: vivid: take data_offset into account for video output (diff)
downloadkernel-qcow2-linux-3f122df4a2ba6704ccf51f5caec583443514644f.tar.gz
kernel-qcow2-linux-3f122df4a2ba6704ccf51f5caec583443514644f.tar.xz
kernel-qcow2-linux-3f122df4a2ba6704ccf51f5caec583443514644f.zip
media: vivid: do not implement VIDIOC_S_PARM for output streams
v4l2_compliance gave a warning for the S_PARM test for output streams: warn: v4l2-test-formats.cpp(1235): S_PARM is supported for buftype 2, but not for ENUM_FRAMEINTERVALS The reason is that vivid mapped s_parm for output streams to g_parm. But if S_PARM doesn't actually change anything, then it shouldn't be enabled at all. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--drivers/media/platform/vivid/vivid-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c
index 745ba6678b40..29e7b14fa704 100644
--- a/drivers/media/platform/vivid/vivid-core.c
+++ b/drivers/media/platform/vivid/vivid-core.c
@@ -371,7 +371,7 @@ static int vidioc_s_parm(struct file *file, void *fh,
if (vdev->vfl_dir == VFL_DIR_RX)
return vivid_vid_cap_s_parm(file, fh, parm);
- return vivid_vid_out_g_parm(file, fh, parm);
+ return -ENOTTY;
}
static int vidioc_log_status(struct file *file, void *fh)