Skip to content

Commit

Permalink
[media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi …
Browse files Browse the repository at this point in the history
…hangs during streaming

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Steven Toth authored and Mauro Carvalho Chehab committed Oct 14, 2011
1 parent 68776b3 commit 1ca3553
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/cx23885/cx23885-vbi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 1ca3553

Please sign in to comment.