summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-23 07:05:22 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 02:05:13 -0300
commitc18cb01ca139716a39f4fb92286b6096e8b3f968 (patch)
treef62cb4909578ee77ceab06f0f4946b29d41def84
parentb20c3cf0c225df1445fa220de175b8d9bc1c3659 (diff)
downloadop-kernel-dev-c18cb01ca139716a39f4fb92286b6096e8b3f968.zip
op-kernel-dev-c18cb01ca139716a39f4fb92286b6096e8b3f968.tar.gz
V4L/DVB (4148): Fix userbits debug prints
Previously, it were showing the pointer value, instead of the setted bits. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/v4l2-common.c4
-rw-r--r--drivers/media/video/videodev.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index bffe482..2b2c0b3 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -486,9 +486,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
prt_names(p->memory,v4l2_memory_names),
p->m.userptr);
printk ("%s: timecode= %02d:%02d:%02d type=%d, "
- "flags=0x%08x, frames=%d, userbits=0x%p\n",
+ "flags=0x%08x, frames=%d, userbits=0x%08x\n",
s,tc->hours,tc->minutes,tc->seconds,
- tc->type, tc->flags, tc->frames, tc->userbits);
+ tc->type, tc->flags, tc->frames, *(__u32 *) tc->userbits);
break;
}
case VIDIOC_QUERYCAP:
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 311149b..4315229 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -323,7 +323,7 @@ static void dbgbuf(unsigned int cmd, struct video_device *vfd,
dbgarg2 ("timecode= %02d:%02d:%02d type=%d, "
"flags=0x%08d, frames=%d, userbits=0x%08x\n",
tc->hours,tc->minutes,tc->seconds,
- tc->type, tc->flags, tc->frames, (__u32) tc->userbits);
+ tc->type, tc->flags, tc->frames, *(__u32 *) tc->userbits);
}
static inline void dbgrect(struct video_device *vfd, char *s,
OpenPOWER on IntegriCloud