aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-hdw.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2007-01-28 14:08:36 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:35:13 -0500
commit201f5c9cafeb88cf0658300bd3bceb5c30d28430 (patch)
treed9a8a2ee53239ba3ffb10b27edaefbdfb0ff20cb /drivers/media/video/pvrusb2/pvrusb2-hdw.c
parent6fe7d2c4660174110c6872cacc4fc2acb6e00acf (diff)
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>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw.c')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 8ba72968639b..40b2f2a6d3cc 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)
3253 3253
3254 3254
3255int pvr2_hdw_register_access(struct pvr2_hdw *hdw, 3255int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
3256 u32 chip_id, u32 reg_id, 3256 u32 chip_id, u64 reg_id,
3257 int setFl,u32 *val_ptr) 3257 int setFl,u32 *val_ptr)
3258{ 3258{
3259#ifdef CONFIG_VIDEO_ADV_DEBUG 3259#ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -3263,6 +3263,8 @@ int pvr2_hdw_register_access(struct pvr2_hdw *hdw,
3263 int stat = 0; 3263 int stat = 0;
3264 int okFl = 0; 3264 int okFl = 0;
3265 3265
3266 if (!capable(CAP_SYS_ADMIN)) return -EPERM;
3267
3266 req.i2c_id = chip_id; 3268 req.i2c_id = chip_id;
3267 req.reg = reg_id; 3269 req.reg = reg_id;
3268 if (setFl) req.val = *val_ptr; 3270 if (setFl) req.val = *val_ptr;