From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 14 Jun 2011 09:24:40 +0000 (+0000)
Subject: acornfb: Dont BUG() on invalid pan parameters
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a1bb7010d494d3fcde3814d7a8ac609f1dff96ee;p=linux-beck.git

acornfb: Dont BUG() on invalid pan parameters

The driver currently BUG()s if the pan parameters passed directly from
userspace are invalid. Return -EINVAL instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 6183a57eb69d..3bacc1290548 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);