summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/v4l2-common.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-24 00:45:00 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-24 00:45:00 -0300
commit57373c62bcab26011b201be49943bf4c0a1615a6 (patch)
tree37192bef64f7ad104e708355c259f929929a1235 /linux/drivers/media/video/v4l2-common.c
parentbe67178c69bc23b071010bf05582d12fc0d44224 (diff)
downloadmediapointer-dvb-s2-57373c62bcab26011b201be49943bf4c0a1615a6.tar.gz
mediapointer-dvb-s2-57373c62bcab26011b201be49943bf4c0a1615a6.tar.bz2
Fixes weird characters and printk
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/v4l2-common.c')
-rw-r--r--linux/drivers/media/video/v4l2-common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c
index 9def5db8b..a9ddfcfa7 100644
--- a/linux/drivers/media/video/v4l2-common.c
+++ b/linux/drivers/media/video/v4l2-common.c
@@ -37,7 +37,7 @@
* Video4linux 1/2 integration by Justin Schoeman
* <justin@suntiger.ee.up.ac.za>
* 2.4 PROCFS support ported from 2.4 kernels by
- * I�ki Garc� Etxebarria <garetxe@euskalnet.net>
+ * Iñaki García Etxebarria <garetxe@euskalnet.net>
* Makefile fix by "W. Michael Petullo" <mike@flyn.org>
* 2.4 devfs support ported from 2.4 kernels by
* Dan Merillat <dan@merillat.org>
@@ -492,7 +492,7 @@ 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%08d, frames=%d, userbits=0x%p\n",
+ "flags=0x%08x, frames=%d, userbits=0x%08p\n",
s,tc->hours,tc->minutes,tc->seconds,
tc->type, tc->flags, tc->frames, tc->userbits);
break;