Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2968e313 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent fcbbf6fb

drivers/media/video/ivtv/ivtv-irq.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}