V4L/DVB (8491): stkwebcam: Always reuse last queued buffer

This change keeps the video stream going on when the application
is slow queuing buffers, instead of spamming dmesg and hanging.

Fixes a problem with aMSN reported by Samed Beyribey <beyribey@gmail.com>

Signed-off-by: Jaime Velasco Juan <jsagarribay@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Jaime Velasco Juan 2008-07-22 12:28:36 -03:00 committed by Mauro Carvalho Chehab
parent f78d92c9ff
commit b18559076a

View File

@ -445,18 +445,19 @@ static void stk_isoc_handler(struct urb *urb)
fb->v4lbuf.bytesused = 0;
fill = fb->buffer;
} else if (fb->v4lbuf.bytesused == dev->frame_size) {
list_move_tail(dev->sio_avail.next,
&dev->sio_full);
wake_up(&dev->wait_frame);
if (list_empty(&dev->sio_avail)) {
(void) (printk_ratelimit() &&
STK_ERROR("No buffer available\n"));
goto resubmit;
if (list_is_singular(&dev->sio_avail)) {
/* Always reuse the last buffer */
fb->v4lbuf.bytesused = 0;
fill = fb->buffer;
} else {
list_move_tail(dev->sio_avail.next,
&dev->sio_full);
wake_up(&dev->wait_frame);
fb = list_first_entry(&dev->sio_avail,
struct stk_sio_buffer, list);
fb->v4lbuf.bytesused = 0;
fill = fb->buffer;
}
fb = list_first_entry(&dev->sio_avail,
struct stk_sio_buffer, list);
fb->v4lbuf.bytesused = 0;
fill = fb->buffer;
}
} else {
framelen -= 4;