diff options
| author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2008-11-17 22:32:11 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@skynet.be> | 2008-11-17 22:32:11 +0100 |
| commit | f7addb7035dedd9ba701c586fec16b234dde4a77 (patch) | |
| tree | e9ce1ba12486e9ace9fa0d7b65ab0ce338629704 | |
| parent | 2a9e9cf9da405aca4f7303353c68de82e180fc2d (diff) | |
| download | mediapointer-dvb-s2-f7addb7035dedd9ba701c586fec16b234dde4a77.tar.gz mediapointer-dvb-s2-f7addb7035dedd9ba701c586fec16b234dde4a77.tar.bz2 | |
uvcvideo: Fix printk badness when printing ioctl names
From: Laurent Pinchart <laurent.pinchart@skynet.be>
Add a trailing newline character after calling v4l_printk_ioctl() to avoid
messing the kernel log up and merge the uvc_v4l2_ioctl message with the ioctl
name.
Priority: normal
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_v4l2.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_v4l2.c b/linux/drivers/media/video/uvc/uvc_v4l2.c index b4191cb21..95eb6f3ad 100644 --- a/linux/drivers/media/video/uvc/uvc_v4l2.c +++ b/linux/drivers/media/video/uvc/uvc_v4l2.c @@ -470,9 +470,6 @@ static int uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) struct uvc_fh *handle = (struct uvc_fh *)file->private_data; int ret = 0; - if (uvc_trace_param & UVC_TRACE_IOCTL) - v4l_printk_ioctl(cmd); - switch (cmd) { /* Query capabilities */ case VIDIOC_QUERYCAP: @@ -989,7 +986,12 @@ static int uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) static int uvc_v4l2_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_ioctl\n"); + if (uvc_trace_param & UVC_TRACE_IOCTL) { + uvc_printk(KERN_DEBUG, "uvc_v4l2_ioctl("); + v4l_printk_ioctl(cmd); + printk(")\n"); + } + return video_usercopy(file, cmd, arg, uvc_v4l2_do_ioctl); } |