summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-01-30 17:47:18 -0800
committerTrent Piepho <xyzzy@speakeasy.org>2007-01-30 17:47:18 -0800
commit89d170b32b5620e4c3be940b825188493bd8f597 (patch)
treee34c2ef7a275e4c18be4ed437a1b38e4d3ea9fc3 /linux/drivers/media
parentfc9fbf0841017b835acd49e045bef72fea3c26ce (diff)
downloadmediapointer-dvb-s2-89d170b32b5620e4c3be940b825188493bd8f597.tar.gz
mediapointer-dvb-s2-89d170b32b5620e4c3be940b825188493bd8f597.tar.bz2
Change VIDIOC_DBG_[SG]_REGISTER ioctls' register address to 64 bits
From: Trent Piepho <xyzzy@speakeasy.org> Maybe someday there will be a device with a register address space > 32-bits, or maybe an i2c device which uses a protocol > 4 bytes long to address its registers. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/v4l2-common.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c
index 231e671c1..26669ebde 100644
--- a/linux/drivers/media/video/v4l2-common.c
+++ b/linux/drivers/media/video/v4l2-common.c
@@ -786,15 +786,17 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
p->id,p->index,p->name);
break;
}
+#ifdef CONFIG_VIDEO_ADV_DEBUG
case VIDIOC_DBG_G_REGISTER:
case VIDIOC_DBG_S_REGISTER:
{
struct v4l2_register *p=arg;
- printk ("%s: i2c_id=%d, reg=%d, val=%d\n", s,
- p->i2c_id,p->reg,p->val);
+ printk ("%s: i2c_id=%d, reg=%llu, val=%u\n", s,
+ p->i2c_id,(unsigned long long)p->reg,p->val);
break;
}
+#endif
case VIDIOC_REQBUFS:
{
struct v4l2_requestbuffers *p=arg;