diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-04-26 10:22:11 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 17:41:35 -0400 |
commit | 2968e31361a2687cebeda6f558f82a3ec9354ca6 (patch) | |
tree | fed19ab5f7b97399688986cf5697d1d6b9293a4d /drivers/media | |
parent | fcbbf6fb07aa020088d5a35c289c80449a8e684b (diff) |
V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms
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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c index a329c4689dbf..d8ba3a4a8761 100644 --- a/drivers/media/video/ivtv/ivtv-irq.c +++ b/drivers/media/video/ivtv/ivtv-irq.c | |||
@@ -384,7 +384,7 @@ static void ivtv_dma_enc_start_xfer(struct ivtv_stream *s) | |||
384 | ivtv_stream_sync_for_device(s); | 384 | ivtv_stream_sync_for_device(s); |
385 | write_reg(s->sg_handle, IVTV_REG_ENCDMAADDR); | 385 | write_reg(s->sg_handle, IVTV_REG_ENCDMAADDR); |
386 | write_reg_sync(read_reg(IVTV_REG_DMAXFER) | 0x02, IVTV_REG_DMAXFER); | 386 | write_reg_sync(read_reg(IVTV_REG_DMAXFER) | 0x02, IVTV_REG_DMAXFER); |
387 | itv->dma_timer.expires = jiffies + msecs_to_jiffies(100); | 387 | itv->dma_timer.expires = jiffies + msecs_to_jiffies(300); |
388 | add_timer(&itv->dma_timer); | 388 | add_timer(&itv->dma_timer); |
389 | } | 389 | } |
390 | 390 | ||
@@ -400,7 +400,7 @@ static void ivtv_dma_dec_start_xfer(struct ivtv_stream *s) | |||
400 | ivtv_stream_sync_for_device(s); | 400 | ivtv_stream_sync_for_device(s); |
401 | write_reg(s->sg_handle, IVTV_REG_DECDMAADDR); | 401 | write_reg(s->sg_handle, IVTV_REG_DECDMAADDR); |
402 | write_reg_sync(read_reg(IVTV_REG_DMAXFER) | 0x01, IVTV_REG_DMAXFER); | 402 | write_reg_sync(read_reg(IVTV_REG_DMAXFER) | 0x01, IVTV_REG_DMAXFER); |
403 | itv->dma_timer.expires = jiffies + msecs_to_jiffies(100); | 403 | itv->dma_timer.expires = jiffies + msecs_to_jiffies(300); |
404 | add_timer(&itv->dma_timer); | 404 | add_timer(&itv->dma_timer); |
405 | } | 405 | } |
406 | 406 | ||