Skip to contentSkip to conversation

pxafb: Minor driver fixes

PATCH Applied Antonino A. Daplas 1 participant 1 message Mar 27, 2006 Framebuffer layer

lore
Share & tools
lore

Antonino A. Daplas

author
#0 lore raw

PATCH 6/7 pxafb: Minor driver fixes

From: Richard Purdie <[email protected]>

Fixes for the pxafb driver:

* Return -EINVAL for resolutions that are too large as per framebuffer driver policy.
* Increase the error timeout for disabling the LCD controller. The current timeout is sometimes too short on the Sharp Zaurus Cxx00 hardware and an extra delay in an error path shouldn't pose any problems.
* Fix a dev reference which causes a compile error when DEBUG is defined.

Signed-off-by Richard Purdie <[email protected]>
Signed-off-by Antonino Daplas <[email protected]>

---

 drivers/video/pxafb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/video/pxafb.c +4 -4
index 53ad61f..809fc5e 100644
@@ -232,9 +232,9 @@ static int pxafb_check_var(struct fb_var
 	if (var->yres < MIN_YRES)
 		var->yres = MIN_YRES;
 	if (var->xres > fbi->max_xres)
-		var->xres = fbi->max_xres;
+		return -EINVAL;
 	if (var->yres > fbi->max_yres)
-		var->yres = fbi->max_yres;
+		return -EINVAL;
 	var->xres_virtual =
 		max(var->xres_virtual, var->xres);
 	var->yres_virtual =

@@ -781,7 +781,7 @@ static void pxafb_disable_controller(str
 	LCCR0 &= ~LCCR0_LDM;	/* Enable LCD Disable Done Interrupt */
 	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */
 
-	schedule_timeout(20 * HZ / 1000);
+	schedule_timeout(200 * HZ / 1000);
 	remove_wait_queue(&fbi->ctrlr_wait, &wait);
 
 	/* disable LCD controller clock */

@@ -1274,7 +1274,7 @@ int __init pxafb_probe(struct platform_d
 	struct pxafb_mach_info *inf;
 	int ret;
 
-	dev_dbg(dev, "pxafb_probe\n");
+	dev_dbg(&dev->dev, "pxafb_probe\n");
 
 	inf = dev->dev.platform_data;
 	ret = -ENOMEM;

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642