diff --git a/[refs] b/[refs]
index 0fb21b9fcd3e..a8277ccb0625 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47625da2ab5e98728cdefbd344fb1493c26769ad
+refs/heads/master: ca21d2dc945c224c3f121f6b5f2436877f029eed
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index ecc146bfc022..229d154424ff 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -452,6 +452,7 @@ static void em28xx_uninit_isoc(struct em28xx *dev)
 
 	dev->isoc_ctl.num_bufs=0;
 
+	del_timer(&dev->vidq.timeout);
 	em28xx_capture_start(dev, 0);
 }
 
@@ -575,9 +576,8 @@ static void em28xx_vid_timeout(unsigned long data)
 	unsigned long flags;
 
 	spin_lock_irqsave(&dev->slock,flags);
-	while (!list_empty(&vidq->active)) {
-		buf = list_entry(vidq->active.next, struct em28xx_buffer,
-								 vb.queue);
+
+	list_for_each_entry(buf, vidq->active.next, vb.queue) {
 		list_del(&buf->vb.queue);
 		buf->vb.state = VIDEOBUF_ERROR;
 		wake_up(&buf->vb.done);