From c36ca897282c031023dd2af69b74e1b6108899a5 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 31 Dec 2010 12:34:32 -0300 Subject: [PATCH] --- yaml --- r: 226424 b: refs/heads/master c: 36f54ff67bc78c6d8dc4a90ac257165e05fdd8da h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-compat-ioctl32.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a2d9936e81ba..6e708818b6a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a5e5af0d2111fdc39c6f2275ed2a9e2e6dd69e2 +refs/heads/master: 36f54ff67bc78c6d8dc4a90ac257165e05fdd8da diff --git a/trunk/drivers/media/video/v4l2-compat-ioctl32.c b/trunk/drivers/media/video/v4l2-compat-ioctl32.c index 65e6f133dd35..dc82eb83c1d4 100644 --- a/trunk/drivers/media/video/v4l2-compat-ioctl32.c +++ b/trunk/drivers/media/video/v4l2-compat-ioctl32.c @@ -165,8 +165,6 @@ static int get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user if (copy_from_user(kp, up, sizeof(kp->fmt.raw_data))) return -EFAULT; return 0; - case 0: - return -EINVAL; default: printk(KERN_INFO "compat_ioctl32: unexpected VIDIOC_FMT type %d\n", kp->type); @@ -196,8 +194,6 @@ static int put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user if (copy_to_user(up, kp, sizeof(up->fmt.raw_data))) return -EFAULT; return 0; - case 0: - return -EINVAL; default: printk(KERN_INFO "compat_ioctl32: unexpected VIDIOC_FMT type %d\n", kp->type);