Commit 732f0cee authored by Dorota Czaplejewicz's avatar Dorota Czaplejewicz Committed by Martin Kepplinger
Browse files

media: mxc: mx6s_capture: fix ctrl_s (see note)

I'm not even sure if the entire deal with enabling queryctrl and ctrl_s makes sense, but if I can set test pattern without reboot, that's a win.
parent 7b9d9bf5
......@@ -1711,15 +1711,7 @@ static int mx6s_vidioc_s_ctrl(struct file *file, void *fh,
struct mx6s_csi_dev *csi_dev = video_drvdata(file);
struct v4l2_subdev *sd = csi_dev->sd;
struct v4l2_ctrl_handler *ctrl_handler = sd->ctrl_handler;
struct v4l2_ctrl *ctrl;
int ret = 0;
ret = v4l2_s_ctrl(fh, ctrl_handler, a);
if (ret)
return ret;
ctrl = v4l2_ctrl_find(fh, a->id);
if (ctrl->ops->s_ctrl)
return ctrl->ops->s_ctrl(ctrl);
return v4l2_s_ctrl(fh, ctrl_handler, a);
static int mx6s_vidioc_enum_framesizes(struct file *file, void *priv,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment