aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt8xx/bttv-vbi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-vbi.c')
-rw-r--r--drivers/media/video/bt8xx/bttv-vbi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 007485aa4f01..346ce019bdcb 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -150,13 +150,14 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
150 150
151 if (redo_dma_risc) { 151 if (redo_dma_risc) {
152 unsigned int bpl, padding, offset; 152 unsigned int bpl, padding, offset;
153 struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
153 154
154 bpl = 2044; /* max. vbipack */ 155 bpl = 2044; /* max. vbipack */
155 padding = VBI_BPL - bpl; 156 padding = VBI_BPL - bpl;
156 157
157 if (fh->vbi_fmt.fmt.count[0] > 0) { 158 if (fh->vbi_fmt.fmt.count[0] > 0) {
158 rc = bttv_risc_packed(btv, &buf->top, 159 rc = bttv_risc_packed(btv, &buf->top,
159 buf->vb.dma.sglist, 160 dma->sglist,
160 /* offset */ 0, bpl, 161 /* offset */ 0, bpl,
161 padding, skip_lines0, 162 padding, skip_lines0,
162 fh->vbi_fmt.fmt.count[0]); 163 fh->vbi_fmt.fmt.count[0]);
@@ -168,7 +169,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
168 offset = fh->vbi_fmt.fmt.count[0] * VBI_BPL; 169 offset = fh->vbi_fmt.fmt.count[0] * VBI_BPL;
169 170
170 rc = bttv_risc_packed(btv, &buf->bottom, 171 rc = bttv_risc_packed(btv, &buf->bottom,
171 buf->vb.dma.sglist, 172 dma->sglist,
172 offset, bpl, 173 offset, bpl,
173 padding, skip_lines1, 174 padding, skip_lines1,
174 fh->vbi_fmt.fmt.count[1]); 175 fh->vbi_fmt.fmt.count[1]);