aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-13 14:07:16 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:08:48 -0400
commitd6849652628d3479859ca10bdd4b21024466df5f (patch)
treef718177ad45c06ce1ba0ba0d16c7d0e3f5d84bde
parentcb7847249f1b2bad201e38c770ef4401c61c022a (diff)
V4L/DVB (7560): videodev: Some printk fixes
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/videodev.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 4c4ee566d257..effcd2ae4152 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -25,7 +25,7 @@
25 25
26#define dbgarg2(fmt, arg...) \ 26#define dbgarg2(fmt, arg...) \
27 if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) \ 27 if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) \
28 printk (KERN_DEBUG "%s: " fmt, vfd->name, ## arg); 28 printk(KERN_DEBUG "%s: " fmt, vfd->name, ## arg);
29 29
30#include <linux/module.h> 30#include <linux/module.h>
31#include <linux/types.h> 31#include <linux/types.h>
@@ -781,6 +781,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
781 if ( (vfd->debug & V4L2_DEBUG_IOCTL) && 781 if ( (vfd->debug & V4L2_DEBUG_IOCTL) &&
782 !(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) { 782 !(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) {
783 v4l_print_ioctl(vfd->name, cmd); 783 v4l_print_ioctl(vfd->name, cmd);
784 printk("\n");
784 } 785 }
785 786
786#ifdef CONFIG_VIDEO_V4L1_COMPAT 787#ifdef CONFIG_VIDEO_V4L1_COMPAT
@@ -1864,8 +1865,9 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
1864 1865
1865 if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) { 1866 if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {
1866 if (ret<0) { 1867 if (ret<0) {
1867 printk ("%s: err:\n", vfd->name); 1868 printk("%s: err: on ", vfd->name);
1868 v4l_print_ioctl(vfd->name, cmd); 1869 v4l_print_ioctl(vfd->name, cmd);
1870 printk("\n");
1869 } 1871 }
1870 } 1872 }
1871 1873