aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-ts.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-ts.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-ts.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index 4b63ad3e8466..f1b8fcaeb43a 100644
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/drivers/media/video/saa7134/saa7134-ts.c
@@ -47,7 +47,7 @@ static int buffer_activate(struct saa7134_dev *dev,
47{ 47{
48 48
49 dprintk("buffer_activate [%p]",buf); 49 dprintk("buffer_activate [%p]",buf);
50 buf->vb.state = STATE_ACTIVE; 50 buf->vb.state = VIDEOBUF_ACTIVE;
51 buf->top_seen = 0; 51 buf->top_seen = 0;
52 52
53 if (NULL == next) 53 if (NULL == next)
@@ -91,7 +91,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
91 saa7134_dma_free(q,buf); 91 saa7134_dma_free(q,buf);
92 } 92 }
93 93
94 if (STATE_NEEDS_INIT == buf->vb.state) { 94 if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
95 struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); 95 struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
96 96
97 buf->vb.width = llength; 97 buf->vb.width = llength;
@@ -121,7 +121,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
121 saa_writel(SAA7134_RS_PITCH(5),TS_PACKET_SIZE); 121 saa_writel(SAA7134_RS_PITCH(5),TS_PACKET_SIZE);
122 saa_writel(SAA7134_RS_CONTROL(5),control); 122 saa_writel(SAA7134_RS_CONTROL(5),control);
123 123
124 buf->vb.state = STATE_PREPARED; 124 buf->vb.state = VIDEOBUF_PREPARED;
125 buf->activate = buffer_activate; 125 buf->activate = buffer_activate;
126 buf->vb.field = field; 126 buf->vb.field = field;
127 return 0; 127 return 0;
@@ -242,7 +242,7 @@ void saa7134_irq_ts_done(struct saa7134_dev *dev, unsigned long status)
242 if ((status & 0x100000) != 0x100000) 242 if ((status & 0x100000) != 0x100000)
243 goto done; 243 goto done;
244 } 244 }
245 saa7134_buffer_finish(dev,&dev->ts_q,STATE_DONE); 245 saa7134_buffer_finish(dev,&dev->ts_q,VIDEOBUF_DONE);
246 } 246 }
247 saa7134_buffer_next(dev,&dev->ts_q); 247 saa7134_buffer_next(dev,&dev->ts_q);
248 248