]> err.no Git - linux-2.6/commitdiff
V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms
authorHans Verkuil <hverkuil@xs4all.nl>
Sat, 26 Apr 2008 14:22:11 +0000 (11:22 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 29 Apr 2008 21:41:35 +0000 (18:41 -0300)
When there is a lot of DMA traffic this timeout might sometimes be too low.
Increase it to be on the safe side.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/ivtv/ivtv-irq.c

index a329c4689dbf71de5b56a307c3256b6d8979aa76..d8ba3a4a8761fb0c66993ae5a2ae998aa068c58f 100644 (file)
@@ -384,7 +384,7 @@ static void ivtv_dma_enc_start_xfer(struct ivtv_stream *s)
        ivtv_stream_sync_for_device(s);
        write_reg(s->sg_handle, IVTV_REG_ENCDMAADDR);
        write_reg_sync(read_reg(IVTV_REG_DMAXFER) | 0x02, IVTV_REG_DMAXFER);
-       itv->dma_timer.expires = jiffies + msecs_to_jiffies(100);
+       itv->dma_timer.expires = jiffies + msecs_to_jiffies(300);
        add_timer(&itv->dma_timer);
 }
 
@@ -400,7 +400,7 @@ static void ivtv_dma_dec_start_xfer(struct ivtv_stream *s)
        ivtv_stream_sync_for_device(s);
        write_reg(s->sg_handle, IVTV_REG_DECDMAADDR);
        write_reg_sync(read_reg(IVTV_REG_DMAXFER) | 0x01, IVTV_REG_DMAXFER);
-       itv->dma_timer.expires = jiffies + msecs_to_jiffies(100);
+       itv->dma_timer.expires = jiffies + msecs_to_jiffies(300);
        add_timer(&itv->dma_timer);
 }