diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-08 23:19:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-08 23:19:22 -0300 |
| commit | 4f1a121a633c3de1bd905b3becd57955b5e2b608 (patch) | |
| tree | 859303f993775836463f03b441a938f9e6541be8 /linux/drivers/media/video/videodev.c | |
| parent | 02e085b956ce32aa54ff3a2e938a0919ac75c643 (diff) | |
| parent | aca3b2a0241d96ebe7198577dd48ba46b3e8079f (diff) | |
| download | mediapointer-dvb-s2-4f1a121a633c3de1bd905b3becd57955b5e2b608.tar.gz mediapointer-dvb-s2-4f1a121a633c3de1bd905b3becd57955b5e2b608.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/dvb-pll-conv
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/videodev.c')
| -rw-r--r-- | linux/drivers/media/video/videodev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index b8e022aed..915e12ff8 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -457,7 +457,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); } |