---

yaml --- r: 30024 b: refs/heads/master c: c18cb01 h: refs/heads/master v: v3
git-mirror · Jun 25, 2006 · c996538 · c996538
1 parent a3ca924
commit c996538
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b20c3cf0c225df1445fa220de175b8d9bc1c3659
+refs/heads/master: c18cb01ca139716a39f4fb92286b6096e8b3f968
diff --git a/trunk/drivers/media/video/v4l2-common.c b/trunk/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/trunk/drivers/media/video/videodev.c b/trunk/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,