aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2011-10-10 10:09:55 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-10-14 16:12:48 -0400
commit1ca3553aa4db1d6795196a8602d33af0178eac06 (patch)
tree5f91dc3a2a8dd4c0f3b8588a181afedf03064497
parent68776b30fe2677e85fe19f4d5f8c8ed42a28d142 (diff)
[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>
-rw-r--r--drivers/media/video/cx23885/cx23885-vbi.c4
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,
151 buf = list_entry(item, struct cx23885_buffer, vb.queue); 151 buf = list_entry(item, struct cx23885_buffer, vb.queue);
152 buf->count = q->count++; 152 buf->count = q->count++;
153 } 153 }
154 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT); 154 mod_timer(&q->timeout, jiffies + (BUFFER_TIMEOUT / 30));
155 return 0; 155 return 0;
156} 156}
157 157
@@ -255,7 +255,7 @@ vbi_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
255 cx23885_start_vbi_dma(dev, q, buf); 255 cx23885_start_vbi_dma(dev, q, buf);
256 buf->vb.state = VIDEOBUF_ACTIVE; 256 buf->vb.state = VIDEOBUF_ACTIVE;
257 buf->count = q->count++; 257 buf->count = q->count++;
258 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT); 258 mod_timer(&q->timeout, jiffies + (BUFFER_TIMEOUT / 30));
259 dprintk(2, "[%p/%d] vbi_queue - first active\n", 259 dprintk(2, "[%p/%d] vbi_queue - first active\n",
260 buf, buf->vb.i); 260 buf, buf->vb.i);
261 261