From ae2471bcc7e3594ab842c763045b335766a54160 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Thu, 28 Sep 2006 17:53:49 -0300
Subject: [PATCH] --- yaml --- r: 38265 b: refs/heads/master c:
 6d98816fbe2b0a6887de0237021d6d900fbaff84 h: refs/heads/master i:   38263:
 e2e139972723e1f72ab9f9fb8447eb6f600e6896 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c  | 9 +++++++--
 trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a8b97c013a62..87bbe430d14b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab9caf9e221ee1b13186a9144da26ac358f2a6f4
+refs/heads/master: 6d98816fbe2b0a6887de0237021d6d900fbaff84
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 11a327d167be..3d8cd0daf6a9 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/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/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 49186984a0d7..97e974d9b9c3 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/trunk/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