From eb5e4eb530fd768caa3399df430d31698f89f83e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 13 Apr 2008 15:07:16 -0300 Subject: [PATCH] --- yaml --- r: 92647 b: refs/heads/master c: d6849652628d3479859ca10bdd4b21024466df5f h: refs/heads/master i: 92645: a93e27f99cbb5a4e4139401dce6e7680a9f19d05 92643: 2a98746b63957e05dbf831f2155510ab0e31fff1 92639: f87ba2dacd86d29553dc177cc5b727c4cda3b3a1 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videodev.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index de158578a10e..d9beed4f2fc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb7847249f1b2bad201e38c770ef4401c61c022a +refs/heads/master: d6849652628d3479859ca10bdd4b21024466df5f diff --git a/trunk/drivers/media/video/videodev.c b/trunk/drivers/media/video/videodev.c index 4c4ee566d257..effcd2ae4152 100644 --- a/trunk/drivers/media/video/videodev.c +++ b/trunk/drivers/media/video/videodev.c @@ -25,7 +25,7 @@ #define dbgarg2(fmt, arg...) \ if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) \ - printk (KERN_DEBUG "%s: " fmt, vfd->name, ## arg); + printk(KERN_DEBUG "%s: " fmt, vfd->name, ## arg); #include #include @@ -781,6 +781,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, if ( (vfd->debug & V4L2_DEBUG_IOCTL) && !(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) { v4l_print_ioctl(vfd->name, cmd); + printk("\n"); } #ifdef CONFIG_VIDEO_V4L1_COMPAT @@ -1864,8 +1865,9 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) { if (ret<0) { - printk ("%s: err:\n", vfd->name); + printk("%s: err: on ", vfd->name); v4l_print_ioctl(vfd->name, cmd); + printk("\n"); } }