aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/cx88/cx88-mpeg.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 810bf8d220c5..e1b38ff0c8a3 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -54,7 +54,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev,
54{ 54{
55 struct cx88_core *core = dev->core; 55 struct cx88_core *core = dev->core;
56 56
57 dprintk(0, "cx8802_start_dma w: %d, h: %d, f: %d\n", dev->width, dev->height, buf->vb.field); 57 dprintk(1, "cx8802_start_dma w: %d, h: %d, f: %d\n", dev->width, dev->height, buf->vb.field);
58 58
59 /* setup fifo + format */ 59 /* setup fifo + format */
60 cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH28], 60 cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH28],
@@ -110,7 +110,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev,
110 q->count = 1; 110 q->count = 1;
111 111
112 /* enable irqs */ 112 /* enable irqs */
113 dprintk( 0, "setting the interrupt mask\n" ); 113 dprintk( 1, "setting the interrupt mask\n" );
114 cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x04); 114 cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x04);
115 cx_set(MO_TS_INTMSK, 0x1f0011); 115 cx_set(MO_TS_INTMSK, 0x1f0011);
116 116
@@ -123,7 +123,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev,
123static int cx8802_stop_dma(struct cx8802_dev *dev) 123static int cx8802_stop_dma(struct cx8802_dev *dev)
124{ 124{
125 struct cx88_core *core = dev->core; 125 struct cx88_core *core = dev->core;
126 dprintk( 0, "cx8802_stop_dma\n" ); 126 dprintk( 1, "cx8802_stop_dma\n" );
127 127
128 /* stop dma */ 128 /* stop dma */
129 cx_clear(MO_TS_DMACNTRL, 0x11); 129 cx_clear(MO_TS_DMACNTRL, 0x11);
@@ -205,13 +205,13 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
205 buf->risc.jmp[1] = cpu_to_le32(cx88q->stopper.dma); 205 buf->risc.jmp[1] = cpu_to_le32(cx88q->stopper.dma);
206 206
207 if (list_empty(&cx88q->active)) { 207 if (list_empty(&cx88q->active)) {
208 dprintk( 0, "queue is empty - first active\n" ); 208 dprintk( 1, "queue is empty - first active\n" );
209 list_add_tail(&buf->vb.queue,&cx88q->active); 209 list_add_tail(&buf->vb.queue,&cx88q->active);
210 cx8802_start_dma(dev, cx88q, buf); 210 cx8802_start_dma(dev, cx88q, buf);
211 buf->vb.state = STATE_ACTIVE; 211 buf->vb.state = STATE_ACTIVE;
212 buf->count = cx88q->count++; 212 buf->count = cx88q->count++;
213 mod_timer(&cx88q->timeout, jiffies+BUFFER_TIMEOUT); 213 mod_timer(&cx88q->timeout, jiffies+BUFFER_TIMEOUT);
214 dprintk(0,"[%p/%d] %s - first active\n", 214 dprintk(1,"[%p/%d] %s - first active\n",
215 buf, buf->vb.i, __FUNCTION__); 215 buf, buf->vb.i, __FUNCTION__);
216 216
217 } else { 217 } else {
@@ -245,7 +245,7 @@ static void do_cancel_buffers(struct cx8802_dev *dev, char *reason, int restart)
245 } 245 }
246 if (restart) 246 if (restart)
247 { 247 {
248 dprintk(0, "restarting queue\n" ); 248 dprintk(1, "restarting queue\n" );
249 cx8802_restart_queue(dev,q); 249 cx8802_restart_queue(dev,q);
250 } 250 }
251 spin_unlock_irqrestore(&dev->slock,flags); 251 spin_unlock_irqrestore(&dev->slock,flags);