diff --git a/[refs] b/[refs]
index 505caf44ab8f..5256c59861db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e1e5979bbe07f1a72276fd486abb3e693364628
+refs/heads/master: 3846e93a65b1a127f59203606c0e92dd22f08782
diff --git a/trunk/drivers/video/acornfb.c b/trunk/drivers/video/acornfb.c
index 6183a57eb69d..3bacc1290548 100644
--- a/trunk/drivers/video/acornfb.c
+++ b/trunk/drivers/video/acornfb.c
@@ -852,7 +852,8 @@ acornfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 	if (!(var->vmode & FB_VMODE_YWRAP))
 		y_bottom += var->yres;
 
-	BUG_ON(y_bottom > var->yres_virtual);
+	if (y_bottom > var->yres_virtual)
+		return -EINVAL;
 
 	acornfb_update_dma(info, var);