MLK-21585 Revert patch to re-add support for capturemode in s_parm

This reverts commit 8a7c5594c02022ca5fa7fb603e11b3e1feb76ed5.

capturemode is needed for legacy support, added it back.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 22d3e7a..cfe0a8c 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1988,22 +1988,7 @@ static int v4l_s_parm(const struct v4l2_ioctl_ops *ops,
        struct v4l2_streamparm *p = arg;
        int ret = check_fmt(file, p->type);
 
-       if (ret)
-               return ret;
-
-       /* 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));
-               p->parm.output.extendedmode = 0;
-               p->parm.output.outputmode &= V4L2_MODE_HIGHQUALITY;
-       } 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);
+       return ret ? ret : ops->vidioc_s_parm(file, fh, p);
 }
 
 static int v4l_queryctrl(const struct v4l2_ioctl_ops *ops,