diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-controls.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-controls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c index 7a876c3e5b19..0005ea46f208 100644 --- a/drivers/media/video/ivtv/ivtv-controls.c +++ b/drivers/media/video/ivtv/ivtv-controls.c | |||
@@ -232,7 +232,7 @@ int ivtv_control_ioctls(struct ivtv *itv, unsigned int cmd, void *arg) | |||
232 | IVTV_DEBUG_IOCTL("VIDIOC_S_EXT_CTRLS\n"); | 232 | IVTV_DEBUG_IOCTL("VIDIOC_S_EXT_CTRLS\n"); |
233 | if (c->ctrl_class == V4L2_CTRL_CLASS_MPEG) { | 233 | if (c->ctrl_class == V4L2_CTRL_CLASS_MPEG) { |
234 | struct cx2341x_mpeg_params p = itv->params; | 234 | struct cx2341x_mpeg_params p = itv->params; |
235 | int err = cx2341x_ext_ctrls(&p, arg, cmd); | 235 | int err = cx2341x_ext_ctrls(&p, atomic_read(&itv->capturing), arg, cmd); |
236 | 236 | ||
237 | if (err) | 237 | if (err) |
238 | return err; | 238 | return err; |
@@ -282,7 +282,7 @@ int ivtv_control_ioctls(struct ivtv *itv, unsigned int cmd, void *arg) | |||
282 | } | 282 | } |
283 | IVTV_DEBUG_IOCTL("VIDIOC_G_EXT_CTRLS\n"); | 283 | IVTV_DEBUG_IOCTL("VIDIOC_G_EXT_CTRLS\n"); |
284 | if (c->ctrl_class == V4L2_CTRL_CLASS_MPEG) | 284 | if (c->ctrl_class == V4L2_CTRL_CLASS_MPEG) |
285 | return cx2341x_ext_ctrls(&itv->params, arg, cmd); | 285 | return cx2341x_ext_ctrls(&itv->params, 0, arg, cmd); |
286 | return -EINVAL; | 286 | return -EINVAL; |
287 | } | 287 | } |
288 | 288 | ||
@@ -292,7 +292,7 @@ int ivtv_control_ioctls(struct ivtv *itv, unsigned int cmd, void *arg) | |||
292 | 292 | ||
293 | IVTV_DEBUG_IOCTL("VIDIOC_TRY_EXT_CTRLS\n"); | 293 | IVTV_DEBUG_IOCTL("VIDIOC_TRY_EXT_CTRLS\n"); |
294 | if (c->ctrl_class == V4L2_CTRL_CLASS_MPEG) | 294 | if (c->ctrl_class == V4L2_CTRL_CLASS_MPEG) |
295 | return cx2341x_ext_ctrls(&itv->params, arg, cmd); | 295 | return cx2341x_ext_ctrls(&itv->params, atomic_read(&itv->capturing), arg, cmd); |
296 | return -EINVAL; | 296 | return -EINVAL; |
297 | } | 297 | } |
298 | 298 | ||