diff options
| author | Steven Toth <stoth@kernellabs.com> | 2011-10-10 16:09:55 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-10-14 22:12:48 +0200 |
| commit | 1ca3553aa4db1d6795196a8602d33af0178eac06 (patch) | |
| tree | 5f91dc3a2a8dd4c0f3b8588a181afedf03064497 /drivers/media/video/cx23885 | |
| parent | [media] cx23885: remove channel dump diagnostics when a vbi buffer times out (diff) | |
| download | linux-1ca3553aa4db1d6795196a8602d33af0178eac06.tar.xz linux-1ca3553aa4db1d6795196a8602d33af0178eac06.zip | |
[media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-vbi.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |