diff --git a/[refs] b/[refs]
index 2e5d100ea1cb..0dd47621071d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e47f30b140333525ea682ec672641b470da1e599
+refs/heads/master: 21a78091921915cd1afd0edb2940dd726edefe9b
diff --git a/trunk/drivers/media/video/cx23885/cx23885-video.c b/trunk/drivers/media/video/cx23885/cx23885-video.c
index 8eaebdb76b1e..40d5e778aa25 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-video.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-video.c
@@ -288,7 +288,7 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,
 		mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
 	}
 	if (bc != 1)
-		printk(KERN_WARN "%s: %d buffers handled (should be 1)\n",
+		printk(KERN_ERR "%s: %d buffers handled (should be 1)\n",
 			__FUNCTION__, bc);
 }