X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fvideo%2Fchipsfb.c;h=73cb426bf2d7db5428ecb348da4b3fc112d2704c;hb=b342baa737164e86cc67d5f16a305d04895ef338;hp=0e465c80ef241f261e7948425eca67c82d1a60a4;hpb=b197ba3c70638a3a2ae39296781912f26ac0f991;p=powerpc.git

diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 0e465c80ef..73cb426bf2 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -19,7 +19,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -150,12 +149,11 @@ static int chipsfb_blank(int blank, struct fb_info *info)
 	mutex_lock(&pmac_backlight_mutex);
 
 	if (pmac_backlight) {
-		down(&pmac_backlight->sem);
-
 		/* used to disable backlight only for blank > 1, but it seems
 		 * useful at blank = 1 too (saves battery, extends backlight
 		 * life)
 	 	 */
+		down(&pmac_backlight->sem);
 		if (blank)
 			pmac_backlight->props->power = FB_BLANK_POWERDOWN;
 		else