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/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 206af419aea7..47007380a98a 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -876,7 +876,7 @@ static int vidioc_g_ext_ctrls (struct file *file, void *priv,
 
         if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                 return -EINVAL;
-        return cx2341x_ext_ctrls(&dev->params, f, VIDIOC_G_EXT_CTRLS);
+        return cx2341x_ext_ctrls(&dev->params, 0, f, VIDIOC_G_EXT_CTRLS);
 }
 
 static int vidioc_s_ext_ctrls (struct file *file, void *priv,
@@ -889,7 +889,7 @@ static int vidioc_s_ext_ctrls (struct file *file, void *priv,
         if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                 return -EINVAL;
         p = dev->params;
-        err = cx2341x_ext_ctrls(&p, f, VIDIOC_S_EXT_CTRLS);
+        err = cx2341x_ext_ctrls(&p, 0, f, VIDIOC_S_EXT_CTRLS);
         if (!err) {
                 err = cx2341x_update(dev, blackbird_mbox_func, &dev->params, &p);
                 dev->params = p;
@@ -907,7 +907,7 @@ static int vidioc_try_ext_ctrls (struct file *file, void *priv,
         if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                 return -EINVAL;
         p = dev->params;
-        err = cx2341x_ext_ctrls(&p, f, VIDIOC_TRY_EXT_CTRLS);
+        err = cx2341x_ext_ctrls(&p, 0, f, VIDIOC_TRY_EXT_CTRLS);
 
         return err;
 }