diff --git a/[refs] b/[refs]
index ccfa40eb83e8..7daabe077e95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b858c331cdf402853be2c48c8f4f77173ef04da8
+refs/heads/master: e003ae399c160e00c1a882dc6dd4f0ef855ae616
diff --git a/trunk/drivers/media/usb/stk1160/stk1160-video.c b/trunk/drivers/media/usb/stk1160/stk1160-video.c
index 0a4ee85f4399..39f1aae209bc 100644
--- a/trunk/drivers/media/usb/stk1160/stk1160-video.c
+++ b/trunk/drivers/media/usb/stk1160/stk1160-video.c
@@ -78,7 +78,7 @@ struct stk1160_buffer *stk1160_next_buffer(struct stk1160 *dev)
 	unsigned long flags = 0;
 
 	/* Current buffer must be NULL when this functions gets called */
-	BUG_ON(dev->isoc_ctl.buf);
+	WARN_ON(dev->isoc_ctl.buf);
 
 	spin_lock_irqsave(&dev->buf_lock, flags);
 	if (!list_empty(&dev->avail_bufs)) {