diff --git a/[refs] b/[refs]
index c2ae25a03e1a..5e77ae856ee6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 276e49a01a7e6c4a7bfb78618cf2f5befbf9f5de
+refs/heads/master: 4ebcb48da1eace49ef5f2d83a91984085c6d702d
diff --git a/trunk/drivers/media/video/video-buf-dvb.c b/trunk/drivers/media/video/video-buf-dvb.c
index e617925ba31e..d2af82dc8faf 100644
--- a/trunk/drivers/media/video/video-buf-dvb.c
+++ b/trunk/drivers/media/video/video-buf-dvb.c
@@ -56,7 +56,6 @@ static int videobuf_dvb_thread(void *data)
 				 struct videobuf_buffer, stream);
 		list_del(&buf->stream);
 		err = videobuf_waiton(buf,0,1);
-		BUG_ON(0 != err);
 
 		/* no more feeds left or stop_feed() asked us to quit */
 		if (0 == dvb->nfeeds)