V4L/DVB (5982): Dev.c: memset fix

[linux-2.6] / drivers / media / video / videodev.c

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index db4bee8427458d7f533bc42723ab816697cdfcfa..0334b9aaf12ad63dc8200e03adb9f61fa7c7f1dd 100644 (file)
--- a/drivers/media/video/videodev.c
+++ b/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);
        }
 
@@ -448,7 +448,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
        if (cmd == VIDIOCGMBUF) {
                struct video_mbuf *p=arg;
 
-               memset(p,0,sizeof(p));
+               memset(p, 0, sizeof(*p));
 
                if (!vfd->vidiocgmbuf)
                        return ret;