aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/v4l2-common.c6
-rw-r--r--include/linux/videodev2.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index d20d4ca5d8a3..1f359252c879 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -754,15 +754,17 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
754 p->id,p->index,p->name); 754 p->id,p->index,p->name);
755 break; 755 break;
756 } 756 }
757#ifdef CONFIG_VIDEO_ADV_DEBUG
757 case VIDIOC_DBG_G_REGISTER: 758 case VIDIOC_DBG_G_REGISTER:
758 case VIDIOC_DBG_S_REGISTER: 759 case VIDIOC_DBG_S_REGISTER:
759 { 760 {
760 struct v4l2_register *p=arg; 761 struct v4l2_register *p=arg;
761 printk ("%s: i2c_id=%d, reg=%d, val=%d\n", s, 762 printk ("%s: i2c_id=%d, reg=%llu, val=%u\n", s,
762 p->i2c_id,p->reg,p->val); 763 p->i2c_id,(unsigned long long)p->reg,p->val);
763 764
764 break; 765 break;
765 } 766 }
767#endif
766 case VIDIOC_REQBUFS: 768 case VIDIOC_REQBUFS:
767 { 769 {
768 struct v4l2_requestbuffers *p=arg; 770 struct v4l2_requestbuffers *p=arg;
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index fe6ccdfa9d48..ad4de64e04d3 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1276,8 +1276,8 @@ struct v4l2_streamparm
1276 1276
1277/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */ 1277/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
1278struct v4l2_register { 1278struct v4l2_register {
1279 __u64 reg;
1279 __u32 i2c_id; /* I2C driver ID of the I2C chip, or 0 for the host */ 1280 __u32 i2c_id; /* I2C driver ID of the I2C chip, or 0 for the host */
1280 __u32 reg;
1281 __u32 val; 1281 __u32 val;
1282}; 1282};
1283 1283