From: Mike Isely <isely@pobox.com>
Date: Thu, 28 Sep 2006 20:53:49 +0000 (-0300)
Subject: V4L/DVB (4675): Pvrusb2: Fix VIDIOC_INT_[G|S]_REGISTER so that it actually works now
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6d98816fbe2b0a6887de0237021d6d900fbaff84;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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 11a327d167b..3d8cd0daf6a 100644
--- 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 49186984a0d..97e974d9b9c 100644
--- 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