summaryrefslogtreecommitdiff
path: root/drivers/media/pci/bt8xx/bttv-driver.c
diff options
context:
space:
mode:
authorDeborah Brouwer <deborah.brouwer@collabora.com>2023-07-15 05:16:03 +0300
committerMauro Carvalho Chehab <mchehab@kernel.org>2023-08-14 21:27:59 +0300
commit9764252d4bdb4314604169876cacb6ca82affbf1 (patch)
tree65aff8af08d03e0d672bebb2c7d5318294cfdb6a /drivers/media/pci/bt8xx/bttv-driver.c
parent04d5356512c6a9097def2214e25d19530ac51413 (diff)
downloadlinux-9764252d4bdb4314604169876cacb6ca82affbf1.tar.xz
media: bttv: remove format field from bttv_buffer
Instead of storing the format (video or vbi) in each bttv buffer separately, just use the global bttv format because the format does not change per buffer. Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'drivers/media/pci/bt8xx/bttv-driver.c')
-rw-r--r--drivers/media/pci/bt8xx/bttv-driver.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index af295ce3e9f0..0032e1436111 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -1553,7 +1553,7 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
/* alloc + fill struct bttv_buffer (if changed) */
if (buf->vb.width != width || buf->vb.height != height ||
buf->vb.field != field ||
- buf->tvnorm != norm || buf->fmt != fmt ||
+ buf->tvnorm != norm || btv->fmt != fmt ||
buf->crop.top != c.rect.top ||
buf->crop.left != c.rect.left ||
buf->crop.width != c.rect.width ||
@@ -1562,7 +1562,6 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
buf->vb.height = height;
buf->vb.field = field;
buf->tvnorm = norm;
- buf->fmt = fmt;
buf->crop = c.rect;
redo_dma_risc = 1;
}