diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 120f0db62..fe87431a6 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.30 2004/07/30 11:14:05 kraxel Exp $ + * $Id: cx88-video.c,v 1.31 2004/07/30 13:43:39 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -466,8 +466,7 @@ static int set_pll(struct cx8800_dev *dev, int prescale, u32 ofreq) return 0; } dprintk(1,"pll not locked yet, waiting ...\n"); - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(HZ/10); + msleep(100); } dprintk(1,"pll NOT locked [pre=%d,ofreq=%d]\n",prescale,ofreq); return -1; @@ -735,7 +734,7 @@ static int start_video_dma(struct cx8800_dev *dev, cx_write(MO_COLOR_CTRL, buf->fmt->cxformat | ColorFormatGamma); /* reset counter */ - cx_write(MO_VIDY_GPCNTRL,0x3); + cx_write(MO_VIDY_GPCNTRL,GP_COUNT_CONTROL_RESET); q->count = 1; /* enable irqs */ @@ -912,7 +911,7 @@ buffer_queue(struct file *file, struct videobuf_buffer *vb) struct cx88_dmaqueue *q = &dev->vidq; /* add jump to stopper */ - buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | 0x10000); + buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC); buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma); if (!list_empty(&q->queued)) { |