diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 6183a57eb69d8b913abcde29af3bbdb24714e725..3bacc1290548f21c7e2e7a084448feaaa5fd7bed 100644
--- a/drivers/video/acornfb.c
+++ b/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);