aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core/v4l2-ioctl.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2019-06-05 07:16:21 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-06-05 15:26:40 -0400
commit4f62e840f827a31d42db91f8ffb9a01420488589 (patch)
tree3c5b72a76da7640ae92d921fdc69f56685d89cc5 /drivers/media/v4l2-core/v4l2-ioctl.c
parentmedia: platform: Fix Warning of Unneeded Semicolon reported by coccicheck (diff)
downloadlinux-dev-4f62e840f827a31d42db91f8ffb9a01420488589.tar.xz
linux-dev-4f62e840f827a31d42db91f8ffb9a01420488589.zip
media: cxusb: Revert "media: cxusb: add raw mode support for, Medion MD95700"
This patch shouldn't have been included in the pull request as it adds a non-standard raw mode that is for debugging only. So revert commit ead14a70754f8d7f5dbcb0553c7f11eb0fc4a6ac. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-ioctl.c')
-rw-r--r--drivers/media/v4l2-core/v4l2-ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index b4c73e8f23c5..14596e8ad2c6 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -2025,7 +2025,7 @@ static int v4l_s_parm(const struct v4l2_ioctl_ops *ops,
if (ret)
return ret;
- /* Note: extendedmode is never used in output drivers */
+ /* Note: extendedmode is never used in drivers */
if (V4L2_TYPE_IS_OUTPUT(p->type)) {
memset(p->parm.output.reserved, 0,
sizeof(p->parm.output.reserved));
@@ -2034,6 +2034,7 @@ static int v4l_s_parm(const struct v4l2_ioctl_ops *ops,
} else {
memset(p->parm.capture.reserved, 0,
sizeof(p->parm.capture.reserved));
+ p->parm.capture.extendedmode = 0;
p->parm.capture.capturemode &= V4L2_MODE_HIGHQUALITY;
}
return ops->vidioc_s_parm(file, fh, p);