aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l2-subdev.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-06-07 05:47:18 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:19 -0400
commitab892bac8438c5c2ff09a60d765d9b0c14941ba9 (patch)
treef0c96b30275086c26b9e17b0092b7587b6f0ac10 /drivers/media/video/v4l2-subdev.c
parenta1c894fba3c306a738576710ca35e70a32b74a6d (diff)
[media] v4l2-ctrls: add v4l2_fh pointer to the set control functions
When an application changes a control you want to generate an event. However, you want to avoid sending such an event back to the application (file handle) that caused the change. Add the filehandle to the various set control functions. The filehandle isn't used yet, but the control event patches will need this. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-subdev.c')
-rw-r--r--drivers/media/video/v4l2-subdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
index f396cc3f32af..fd5dccaf3519 100644
--- a/drivers/media/video/v4l2-subdev.c
+++ b/drivers/media/video/v4l2-subdev.c
@@ -164,13 +164,13 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
164 return v4l2_g_ctrl(vfh->ctrl_handler, arg); 164 return v4l2_g_ctrl(vfh->ctrl_handler, arg);
165 165
166 case VIDIOC_S_CTRL: 166 case VIDIOC_S_CTRL:
167 return v4l2_s_ctrl(vfh->ctrl_handler, arg); 167 return v4l2_s_ctrl(vfh, vfh->ctrl_handler, arg);
168 168
169 case VIDIOC_G_EXT_CTRLS: 169 case VIDIOC_G_EXT_CTRLS:
170 return v4l2_g_ext_ctrls(vfh->ctrl_handler, arg); 170 return v4l2_g_ext_ctrls(vfh->ctrl_handler, arg);
171 171
172 case VIDIOC_S_EXT_CTRLS: 172 case VIDIOC_S_EXT_CTRLS:
173 return v4l2_s_ext_ctrls(vfh->ctrl_handler, arg); 173 return v4l2_s_ext_ctrls(vfh, vfh->ctrl_handler, arg);
174 174
175 case VIDIOC_TRY_EXT_CTRLS: 175 case VIDIOC_TRY_EXT_CTRLS:
176 return v4l2_try_ext_ctrls(vfh->ctrl_handler, arg); 176 return v4l2_try_ext_ctrls(vfh->ctrl_handler, arg);