V4L/DVB (6088): cx2341x: some controls can't be changed while the device is busy

The driver should now pass the 'busy' state of the device to the cx2341x 
module whenever controls are set or tried. -EBUSY will be returned if 
the device is busy and the user attempts to modify certain 'dangerous' 
controls. It concerns controls that change the audio or video 
compression mode and bitrates.

The cx88-blackbird and pvrusb2 drivers currently always pass '0' (not busy)
to the cx2341x, effectively keeping the old behavior for now.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

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)
                 IVTV_DEBUG_IOCTL("VIDIOC_S_EXT_CTRLS\n");
                 if (c->ctrl_class == V4L2_CTRL_CLASS_MPEG) {
                         struct cx2341x_mpeg_params p = itv->params;
-                        int err = cx2341x_ext_ctrls(&p, arg, cmd);
+                        int err = cx2341x_ext_ctrls(&p, atomic_read(&itv->capturing), arg, cmd);
 
                         if (err)
                                 return err;
@@ -282,7 +282,7 @@ int ivtv_control_ioctls(struct ivtv *itv, unsigned int cmd, void *arg)
                 }
                 IVTV_DEBUG_IOCTL("VIDIOC_G_EXT_CTRLS\n");
                 if (c->ctrl_class == V4L2_CTRL_CLASS_MPEG)
-                        return cx2341x_ext_ctrls(&itv->params, arg, cmd);
+                        return cx2341x_ext_ctrls(&itv->params, 0, arg, cmd);
                 return -EINVAL;
         }
 
@@ -292,7 +292,7 @@ int ivtv_control_ioctls(struct ivtv *itv, unsigned int cmd, void *arg)
 
                 IVTV_DEBUG_IOCTL("VIDIOC_TRY_EXT_CTRLS\n");
                 if (c->ctrl_class == V4L2_CTRL_CLASS_MPEG)
-                        return cx2341x_ext_ctrls(&itv->params, arg, cmd);
+                        return cx2341x_ext_ctrls(&itv->params, atomic_read(&itv->capturing), arg, cmd);
                 return -EINVAL;
         }