Skip to content

L
linux-davinci
Commit d6849652 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (7560): videodev: Some printk fixes 

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent cb784724
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
drivers/media/video/videodev.c
View file @ d6849652
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#define dbgarg2(fmt, arg...) \ #define dbgarg2(fmt, arg...) \
if (vfd->debug & V4L2_DEBUG_IOCTL_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/module.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -781,6 +781,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, ...@@ -781,6 +781,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
if ( (vfd->debug & V4L2_DEBUG_IOCTL) && if ( (vfd->debug & V4L2_DEBUG_IOCTL) &&
!(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) { !(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) {
v4l_print_ioctl(vfd->name, cmd); v4l_print_ioctl(vfd->name, cmd);
printk("\n");
} }
#ifdef CONFIG_VIDEO_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
...@@ -1864,8 +1865,9 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, ...@@ -1864,8 +1865,9 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) { if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {
if (ret<0) { if (ret<0) {
printk ("%s: err:\n", vfd->name); printk("%s: err: on ", vfd->name);
v4l_print_ioctl(vfd->name, cmd); v4l_print_ioctl(vfd->name, cmd);
printk("\n");
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment