From: Mike Isely <isely@pobox.com>
Date: Sun, 28 Jan 2007 19:08:36 +0000 (-0300)
Subject: V4L/DVB (5175): Pvrusb2: VIDIOC_DBG_[S|G]_REGISTER fixups
X-Git-Tag: v2.6.21-rc2~66^2~56
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=201f5c9cafeb88cf0658300bd3bceb5c30d28430;p=linux-2.6

V4L/DVB (5175): Pvrusb2: VIDIOC_DBG_[S|G]_REGISTER fixups

Support 64 bit register IDs internally.  Only allow root access to
this API (for both set and get).  Note that actual 64 bit access only
becomes possible once the definition for v4l2_register is updated, but
this change clears the way for it from the viewpoint of the pvrusb2
driver.

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 8ba7296863..40b2f2a6d3 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -3253,7 +3253,7 @@ static int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw)
 
 
 int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
-			     u32 chip_id, u32 reg_id,
+			     u32 chip_id, u64 reg_id,
 			     int setFl,u32 *val_ptr)
 {
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -3263,6 +3263,8 @@ int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
 	int stat = 0;
 	int okFl = 0;
 
+	if (!capable(CAP_SYS_ADMIN)) return -EPERM;
+
 	req.i2c_id = chip_id;
 	req.reg = reg_id;
 	if (setFl) req.val = *val_ptr;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index e6df8e4a7f..566a8ef7e1 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -222,7 +222,7 @@ void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *,
    setFl   - true to set the register, false to read it
    val_ptr - storage location for source / result. */
 int pvr2_hdw_register_access(struct pvr2_hdw *,
-			     u32 chip_id,u32 reg_id,
+			     u32 chip_id,u64 reg_id,
 			     int setFl,u32 *val_ptr);
 
 /* The following entry points are all lower level things you normally don't
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 024b6d80ea..4fe4136204 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -738,10 +738,6 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 	}
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 	case VIDIOC_DBG_S_REGISTER:
-		if (!capable(CAP_SYS_ADMIN)) {
-			ret = -EPERM;
-			break;
-		} /* fall through */
 	case VIDIOC_DBG_G_REGISTER:
 	{
 		u32 val;