diff options
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-vbi.c')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-vbi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c index 346ce019bdcb..b924f05e3b74 100644 --- a/drivers/media/video/bt8xx/bttv-vbi.c +++ b/drivers/media/video/bt8xx/bttv-vbi.c | |||
@@ -142,7 +142,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q, | |||
142 | redo_dma_risc = 1; | 142 | redo_dma_risc = 1; |
143 | } | 143 | } |
144 | 144 | ||
145 | if (STATE_NEEDS_INIT == buf->vb.state) { | 145 | if (VIDEOBUF_NEEDS_INIT == buf->vb.state) { |
146 | redo_dma_risc = 1; | 146 | redo_dma_risc = 1; |
147 | if (0 != (rc = videobuf_iolock(q, &buf->vb, NULL))) | 147 | if (0 != (rc = videobuf_iolock(q, &buf->vb, NULL))) |
148 | goto fail; | 148 | goto fail; |
@@ -189,7 +189,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q, | |||
189 | /* For bttv_buffer_activate_vbi(). */ | 189 | /* For bttv_buffer_activate_vbi(). */ |
190 | buf->geo.vdelay = min_vdelay; | 190 | buf->geo.vdelay = min_vdelay; |
191 | 191 | ||
192 | buf->vb.state = STATE_PREPARED; | 192 | buf->vb.state = VIDEOBUF_PREPARED; |
193 | buf->vb.field = field; | 193 | buf->vb.field = field; |
194 | dprintk("buf prepare %p: top=%p bottom=%p field=%s\n", | 194 | dprintk("buf prepare %p: top=%p bottom=%p field=%s\n", |
195 | vb, &buf->top, &buf->bottom, | 195 | vb, &buf->top, &buf->bottom, |
@@ -209,7 +209,7 @@ vbi_buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) | |||
209 | struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb); | 209 | struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb); |
210 | 210 | ||
211 | dprintk("queue %p\n",vb); | 211 | dprintk("queue %p\n",vb); |
212 | buf->vb.state = STATE_QUEUED; | 212 | buf->vb.state = VIDEOBUF_QUEUED; |
213 | list_add_tail(&buf->vb.queue,&btv->vcapture); | 213 | list_add_tail(&buf->vb.queue,&btv->vcapture); |
214 | if (NULL == btv->cvbi) { | 214 | if (NULL == btv->cvbi) { |
215 | fh->btv->loop_irq |= 4; | 215 | fh->btv->loop_irq |= 4; |