From d0633f9640fbd8bdf922fc78f27ed53bc6f23405 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Wed, 4 Mar 2009 01:21:03 -0300 Subject: [PATCH] --- yaml --- r: 138047 b: refs/heads/master c: df7bdfcd0efa9a25a7c9751a25b4d4efd9141b8d h: refs/heads/master i: 138045: d8bbfff01e920f7888bc2330964ca9fd78423469 138043: edb786ee40d3bb963955bddedb005c4777232bb0 138039: a1d3140866a8ac6051154af8c94427f603b04318 138031: c782e538593b647eff837980a1e1e9256c8164c7 138015: b6974eea247dca4a6ce0b3e8933801002d0d19c4 137983: 8e4fde78bda23e0aa1ac8a646942edda28e35479 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/stk-webcam.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d2bcd3225f6f..87198c364edc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3334bcbf44ad9001460508ef4fbe51e706d24cf +refs/heads/master: df7bdfcd0efa9a25a7c9751a25b4d4efd9141b8d diff --git a/trunk/drivers/media/video/stk-webcam.c b/trunk/drivers/media/video/stk-webcam.c index 686720d8bfed..6b7f0da9b515 100644 --- a/trunk/drivers/media/video/stk-webcam.c +++ b/trunk/drivers/media/video/stk-webcam.c @@ -933,8 +933,6 @@ static int stk_vidioc_s_ctrl(struct file *filp, static int stk_vidioc_enum_fmt_vid_cap(struct file *filp, void *priv, struct v4l2_fmtdesc *fmtd) { - fmtd->flags = 0; - switch (fmtd->index) { case 0: fmtd->pixelformat = V4L2_PIX_FMT_RGB565; @@ -992,7 +990,6 @@ static int stk_vidioc_g_fmt_vid_cap(struct file *filp, pix_format->height = stk_sizes[i].h; pix_format->field = V4L2_FIELD_NONE; pix_format->colorspace = V4L2_COLORSPACE_SRGB; - pix_format->priv = 0; pix_format->pixelformat = dev->vsettings.palette; if (dev->vsettings.palette == V4L2_PIX_FMT_SBGGR8) pix_format->bytesperline = pix_format->width; @@ -1246,13 +1243,10 @@ static int stk_vidioc_g_parm(struct file *filp, if (sp->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL; - sp->parm.capture.capability = 0; - sp->parm.capture.capturemode = 0; /*FIXME This is not correct */ sp->parm.capture.timeperframe.numerator = 1; sp->parm.capture.timeperframe.denominator = 30; sp->parm.capture.readbuffers = 2; - sp->parm.capture.extendedmode = 0; return 0; }