V4L/DVB (4675): Pvrusb2: Fix VIDIOC_INT_[G|S]_REGISTER so that it actually works now

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 11a327d167be8fab0e9e7e07a1a94c25d95682a1..3d8cd0daf6a9314d1dbc1a37194a57d7a05ac510 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -3140,7 +3140,8 @@ int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
        struct list_head *item;
        struct pvr2_i2c_client *cp;
        struct v4l2_register req;
-       int stat;
+       int stat = 0;
+       int okFl = 0;
 
        req.i2c_id = chip_id;
        req.reg = reg_id;
@@ -3153,9 +3154,13 @@ int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
                                cp,(setFl ? VIDIOC_INT_S_REGISTER :
                                    VIDIOC_INT_G_REGISTER),&req);
                        if (!setFl) *val_ptr = req.val;
-                       return stat;
+                       okFl = !0;
+                       break;
                }
        } while (0); mutex_unlock(&hdw->i2c_list_lock);
+       if (okFl) {
+               return stat;
+       }
        return -EINVAL;
 #else
        return -ENOSYS;

diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 49186984a0d783a2b754dd5131b7ed163f5e9bf2..97e974d9b9c34ba8b215f0a61eb9a04f96e34008 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -671,7 +671,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                ret = pvr2_hdw_register_access(
                        hdw,req->i2c_id,req->reg,
                        cmd == VIDIOC_INT_S_REGISTER,&val);
-               if (cmd == 0) req->val = val;
+               if (cmd == VIDIOC_INT_G_REGISTER) req->val = val;
                break;
        }
 #endif