aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 863fcb31622f..3d400e4b7a27 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -697,7 +697,6 @@ static int vidioc_g_audio (struct file *file, void *priv, struct v4l2_audio *a)
697{ 697{
698 struct usb_usbvision *usbvision = video_drvdata(file); 698 struct usb_usbvision *usbvision = video_drvdata(file);
699 699
700 memset(a,0,sizeof(*a));
701 if(usbvision->radio) { 700 if(usbvision->radio) {
702 strcpy(a->name,"Radio"); 701 strcpy(a->name,"Radio");
703 } else { 702 } else {
@@ -721,10 +720,6 @@ static int vidioc_queryctrl (struct file *file, void *priv,
721 struct v4l2_queryctrl *ctrl) 720 struct v4l2_queryctrl *ctrl)
722{ 721{
723 struct usb_usbvision *usbvision = video_drvdata(file); 722 struct usb_usbvision *usbvision = video_drvdata(file);
724 int id=ctrl->id;
725
726 memset(ctrl,0,sizeof(*ctrl));
727 ctrl->id=id;
728 723
729 call_all(usbvision, core, queryctrl, ctrl); 724 call_all(usbvision, core, queryctrl, ctrl);
730 725
@@ -926,11 +921,9 @@ static int vidioc_enum_fmt_vid_cap (struct file *file, void *priv,
926 if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) { 921 if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) {
927 return -EINVAL; 922 return -EINVAL;
928 } 923 }
929 vfd->flags = 0;
930 vfd->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; 924 vfd->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
931 strcpy(vfd->description,usbvision_v4l2_format[vfd->index].desc); 925 strcpy(vfd->description,usbvision_v4l2_format[vfd->index].desc);
932 vfd->pixelformat = usbvision_v4l2_format[vfd->index].format; 926 vfd->pixelformat = usbvision_v4l2_format[vfd->index].format;
933 memset(vfd->reserved, 0, sizeof(vfd->reserved));
934 return 0; 927 return 0;
935} 928}
936 929