From: Steven Toth Date: Mon, 10 Oct 2011 14:09:55 +0000 (-0300) Subject: [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during... X-Git-Tag: MMI-PSA29.97-13-9~18177^2~18 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1ca3553aa4db1d6795196a8602d33af0178eac06;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c index 499bc45b7d0d..a1154f035bc1 100644 --- a/drivers/media/video/cx23885/cx23885-vbi.c +++ b/drivers/media/video/cx23885/cx23885-vbi.c @@ -151,7 +151,7 @@ int cx23885_restart_vbi_queue(struct cx23885_dev *dev, buf = list_entry(item, struct cx23885_buffer, vb.queue); buf->count = q->count++; } - mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT); + mod_timer(&q->timeout, jiffies + (BUFFER_TIMEOUT / 30)); return 0; } @@ -255,7 +255,7 @@ vbi_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) cx23885_start_vbi_dma(dev, q, buf); buf->vb.state = VIDEOBUF_ACTIVE; buf->count = q->count++; - mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT); + mod_timer(&q->timeout, jiffies + (BUFFER_TIMEOUT / 30)); dprintk(2, "[%p/%d] vbi_queue - first active\n", buf, buf->vb.i);