]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (10818): usbvision: Don't need to zero ioctl parameter fields
authorTrent Piepho <xyzzy@speakeasy.org>
Wed, 4 Mar 2009 04:21:03 +0000 (01:21 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Mar 2009 15:43:06 +0000 (12:43 -0300)
The v4l2 core code in v4l2_ioctl will zero out the structure the driver is
supposed to fill in for read-only ioctls.  For read/write ioctls, all the
fields which aren't supplied from userspace will be zeroed out.

Zeroing code is removed from g_audio, queryctrl, and enum_fmt_vid_cap.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/usbvision/usbvision-video.c

index 863fcb31622ff1fffe1da509159dad3bd42c4400..3d400e4b7a27f0c062c9827c53852edc0245696d 100644 (file)
@@ -697,7 +697,6 @@ static int vidioc_g_audio (struct file *file, void *priv, struct v4l2_audio *a)
 {
        struct usb_usbvision *usbvision = video_drvdata(file);
 
-       memset(a,0,sizeof(*a));
        if(usbvision->radio) {
                strcpy(a->name,"Radio");
        } else {
@@ -721,10 +720,6 @@ static int vidioc_queryctrl (struct file *file, void *priv,
                            struct v4l2_queryctrl *ctrl)
 {
        struct usb_usbvision *usbvision = video_drvdata(file);
-       int id=ctrl->id;
-
-       memset(ctrl,0,sizeof(*ctrl));
-       ctrl->id=id;
 
        call_all(usbvision, core, queryctrl, ctrl);
 
@@ -926,11 +921,9 @@ static int vidioc_enum_fmt_vid_cap (struct file *file, void  *priv,
        if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) {
                return -EINVAL;
        }
-       vfd->flags = 0;
        vfd->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
        strcpy(vfd->description,usbvision_v4l2_format[vfd->index].desc);
        vfd->pixelformat = usbvision_v4l2_format[vfd->index].format;
-       memset(vfd->reserved, 0, sizeof(vfd->reserved));
        return 0;
 }