aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/stk-webcam.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index 686720d8bfed..6b7f0da9b515 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -933,8 +933,6 @@ static int stk_vidioc_s_ctrl(struct file *filp,
933static int stk_vidioc_enum_fmt_vid_cap(struct file *filp, 933static int stk_vidioc_enum_fmt_vid_cap(struct file *filp,
934 void *priv, struct v4l2_fmtdesc *fmtd) 934 void *priv, struct v4l2_fmtdesc *fmtd)
935{ 935{
936 fmtd->flags = 0;
937
938 switch (fmtd->index) { 936 switch (fmtd->index) {
939 case 0: 937 case 0:
940 fmtd->pixelformat = V4L2_PIX_FMT_RGB565; 938 fmtd->pixelformat = V4L2_PIX_FMT_RGB565;
@@ -992,7 +990,6 @@ static int stk_vidioc_g_fmt_vid_cap(struct file *filp,
992 pix_format->height = stk_sizes[i].h; 990 pix_format->height = stk_sizes[i].h;
993 pix_format->field = V4L2_FIELD_NONE; 991 pix_format->field = V4L2_FIELD_NONE;
994 pix_format->colorspace = V4L2_COLORSPACE_SRGB; 992 pix_format->colorspace = V4L2_COLORSPACE_SRGB;
995 pix_format->priv = 0;
996 pix_format->pixelformat = dev->vsettings.palette; 993 pix_format->pixelformat = dev->vsettings.palette;
997 if (dev->vsettings.palette == V4L2_PIX_FMT_SBGGR8) 994 if (dev->vsettings.palette == V4L2_PIX_FMT_SBGGR8)
998 pix_format->bytesperline = pix_format->width; 995 pix_format->bytesperline = pix_format->width;
@@ -1246,13 +1243,10 @@ static int stk_vidioc_g_parm(struct file *filp,
1246 if (sp->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) 1243 if (sp->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
1247 return -EINVAL; 1244 return -EINVAL;
1248 1245
1249 sp->parm.capture.capability = 0;
1250 sp->parm.capture.capturemode = 0;
1251 /*FIXME This is not correct */ 1246 /*FIXME This is not correct */
1252 sp->parm.capture.timeperframe.numerator = 1; 1247 sp->parm.capture.timeperframe.numerator = 1;
1253 sp->parm.capture.timeperframe.denominator = 30; 1248 sp->parm.capture.timeperframe.denominator = 30;
1254 sp->parm.capture.readbuffers = 2; 1249 sp->parm.capture.readbuffers = 2;
1255 sp->parm.capture.extendedmode = 0;
1256 return 0; 1250 return 0;
1257} 1251}
1258 1252