From 0a9ab67ed8b99e2f64e4e4205fe66b3c817ac57a Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 14 Mar 2013 07:40:45 -0300 Subject: [PATCH] --- yaml --- r: 366757 b: refs/heads/master c: 505d04bdc43a6a6c828835e90ab5fcb380d631d5 h: refs/heads/master i: 366755: 762de09af01d539ae6e6736c6f75912829604fe8 v: v3 --- [refs] | 2 +- trunk/drivers/media/v4l2-core/v4l2-ioctl.c | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index e4b547ebedc5..bb072ab1679e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 977ba3b1b73f24fae2d0c8bd59d7a4696f1e0ccc +refs/heads/master: 505d04bdc43a6a6c828835e90ab5fcb380d631d5 diff --git a/trunk/drivers/media/v4l2-core/v4l2-ioctl.c b/trunk/drivers/media/v4l2-core/v4l2-ioctl.c index 936ca25bd5be..168b51e193cd 100644 --- a/trunk/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/trunk/drivers/media/v4l2-core/v4l2-ioctl.c @@ -2155,11 +2155,6 @@ static long __video_do_ioctl(struct file *file, } write_only = _IOC_DIR(cmd) == _IOC_WRITE; - if (write_only && debug > V4L2_DEBUG_IOCTL) { - v4l_printk_ioctl(video_device_node_name(vfd), cmd); - pr_cont(": "); - info->debug(arg, write_only); - } if (info->flags & INFO_FL_STD) { typedef int (*vidioc_op)(struct file *file, void *fh, void *p); const void *p = vfd->ioctl_ops; @@ -2178,16 +2173,10 @@ static long __video_do_ioctl(struct file *file, done: if (debug) { - if (write_only && debug > V4L2_DEBUG_IOCTL) { - if (ret < 0) - printk(KERN_DEBUG "%s: error %ld\n", - video_device_node_name(vfd), ret); - return ret; - } v4l_printk_ioctl(video_device_node_name(vfd), cmd); if (ret < 0) - pr_cont(": error %ld\n", ret); - else if (debug == V4L2_DEBUG_IOCTL) + pr_cont(": error %ld", ret); + if (debug == V4L2_DEBUG_IOCTL) pr_cont("\n"); else if (_IOC_DIR(cmd) == _IOC_NONE) info->debug(arg, write_only);