summaryrefslogtreecommitdiff
path: root/drivers/media/usb/s2255
diff options
context:
space:
mode:
authorDean Anderson <linux-dev@sensoray.com>2014-02-05 15:18:55 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-02-28 14:20:22 -0300
commit8bf405a0da59cee39e244ec75465017248bdef10 (patch)
tree4da51af40bb5b61a59ba60fa73962a495669c735 /drivers/media/usb/s2255
parent9da62eb01f7b38af3c9e75e786eed5dfdb622753 (diff)
[media] s2255drv: remove redundant parameter
Removing duplicate fmt from buffer structure. Signed-off-by: Dean Anderson <linux-dev@sensoray.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/s2255')
-rw-r--r--drivers/media/usb/s2255/s2255drv.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 1b267b1bb5f6..517901b25bf8 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -290,7 +290,6 @@ struct s2255_fmt {
struct s2255_buffer {
/* common v4l buffer stuff -- must be first */
struct videobuf_buffer vb;
- const struct s2255_fmt *fmt;
};
struct s2255_fh {
@@ -625,13 +624,13 @@ static void s2255_fillbuff(struct s2255_vc *vc,
if (last_frame != -1) {
tmpbuf =
(const char *)vc->buffer.frame[last_frame].lpvbits;
- switch (buf->fmt->fourcc) {
+ switch (vc->fmt->fourcc) {
case V4L2_PIX_FMT_YUYV:
case V4L2_PIX_FMT_UYVY:
planar422p_to_yuv_packed((const unsigned char *)tmpbuf,
vbuf, buf->vb.width,
buf->vb.height,
- buf->fmt->fourcc);
+ vc->fmt->fourcc);
break;
case V4L2_PIX_FMT_GREY:
memcpy(vbuf, tmpbuf, buf->vb.width * buf->vb.height);
@@ -711,7 +710,6 @@ static int buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
return -EINVAL;
}
- buf->fmt = vc->fmt;
buf->vb.width = w;
buf->vb.height = h;
buf->vb.field = field;