---

yaml --- r: 92647 b: refs/heads/master c: d684965 h: refs/heads/master i: 92645: a93e27f 92643: 2a98746 92639: f87ba2d v: v3
git-mirror · Apr 24, 2008 · eb5e4eb · eb5e4eb
1 parent b2fabbe
commit eb5e4eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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 <linux/module.h>
 #include <linux/types.h>
@@ -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");
 		}
 	}