From fba7b3aa7bc03b7a39fb2537e0c09fadd66ed24a Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 7 May 2007 10:55:49 -0300 Subject: [PATCH] --- yaml --- r: 56085 b: refs/heads/master c: 57e45b31c1f32d15b6642c3af1578ee40be35dfb h: refs/heads/master i: 56083: e13449c692bbe080c2c86e06c0af034b3c54aedb v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videodev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4b261cb164e4..aaaba6d113d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14c4ffbe68247776ad45f1e9c4b6a74abb6936c0 +refs/heads/master: 57e45b31c1f32d15b6642c3af1578ee40be35dfb diff --git a/trunk/drivers/media/video/videodev.c b/trunk/drivers/media/video/videodev.c index db4bee842745..b876aca69c73 100644 --- a/trunk/drivers/media/video/videodev.c +++ b/trunk/drivers/media/video/videodev.c @@ -433,7 +433,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, int ret = -EINVAL; if ( (vfd->debug & V4L2_DEBUG_IOCTL) && - !(vfd->debug | V4L2_DEBUG_IOCTL_ARG)) { + !(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) { v4l_print_ioctl(vfd->name, cmd); }