aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-vbi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-vbi.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-vbi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c
index 81a2aedeff5c..f0d5ed9c2b06 100644
--- a/drivers/media/video/saa7134/saa7134-vbi.c
+++ b/drivers/media/video/saa7134/saa7134-vbi.c
@@ -85,7 +85,7 @@ static int buffer_activate(struct saa7134_dev *dev,
85 unsigned long control,base; 85 unsigned long control,base;
86 86
87 dprintk("buffer_activate [%p]\n",buf); 87 dprintk("buffer_activate [%p]\n",buf);
88 buf->vb.state = STATE_ACTIVE; 88 buf->vb.state = VIDEOBUF_ACTIVE;
89 buf->top_seen = 0; 89 buf->top_seen = 0;
90 90
91 task_init(dev,buf,TASK_A); 91 task_init(dev,buf,TASK_A);
@@ -136,7 +136,7 @@ static int buffer_prepare(struct videobuf_queue *q,
136 if (buf->vb.size != size) 136 if (buf->vb.size != size)
137 saa7134_dma_free(q,buf); 137 saa7134_dma_free(q,buf);
138 138
139 if (STATE_NEEDS_INIT == buf->vb.state) { 139 if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
140 struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); 140 struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
141 141
142 buf->vb.width = llength; 142 buf->vb.width = llength;
@@ -154,7 +154,7 @@ static int buffer_prepare(struct videobuf_queue *q,
154 if (err) 154 if (err)
155 goto oops; 155 goto oops;
156 } 156 }
157 buf->vb.state = STATE_PREPARED; 157 buf->vb.state = VIDEOBUF_PREPARED;
158 buf->activate = buffer_activate; 158 buf->activate = buffer_activate;
159 buf->vb.field = field; 159 buf->vb.field = field;
160 return 0; 160 return 0;
@@ -240,7 +240,7 @@ void saa7134_irq_vbi_done(struct saa7134_dev *dev, unsigned long status)
240 goto done; 240 goto done;
241 241
242 dev->vbi_q.curr->vb.field_count = dev->vbi_fieldcount; 242 dev->vbi_q.curr->vb.field_count = dev->vbi_fieldcount;
243 saa7134_buffer_finish(dev,&dev->vbi_q,STATE_DONE); 243 saa7134_buffer_finish(dev,&dev->vbi_q,VIDEOBUF_DONE);
244 } 244 }
245 saa7134_buffer_next(dev,&dev->vbi_q); 245 saa7134_buffer_next(dev,&dev->vbi_q);
246 246