1 files changed, 13 insertions, 9 deletions

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 1507d19f481f..19a71f045784 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2200,10 +2200,14 @@ static struct backlight_properties aty_bl_data = {
 static void aty_bl_set_power(struct fb_info *info, int power)
 {
         mutex_lock(&info->bl_mutex);
-        up(&info->bl_dev->sem);
-        info->bl_dev->props->power = power;
-        __aty_bl_update_status(info->bl_dev);
-        down(&info->bl_dev->sem);
+
+        if (info->bl_dev) {
+                down(&info->bl_dev->sem);
+                info->bl_dev->props->power = power;
+                __aty_bl_update_status(info->bl_dev);
+                up(&info->bl_dev->sem);
+        }
+
         mutex_unlock(&info->bl_mutex);
 }
 
@@ -2223,7 +2227,7 @@ static void aty_bl_init(struct atyfb_par *par)
         bd = backlight_device_register(name, par, &aty_bl_data);
         if (IS_ERR(bd)) {
                 info->bl_dev = NULL;
-                printk("aty: Backlight registration failed\n");
+                printk(KERN_WARNING "aty: Backlight registration failed\n");
                 goto error;
         }
 
@@ -2234,11 +2238,11 @@ static void aty_bl_init(struct atyfb_par *par)
                 0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL);
         mutex_unlock(&info->bl_mutex);
 
-        up(&bd->sem);
+        down(&bd->sem);
         bd->props->brightness = aty_bl_data.max_brightness;
         bd->props->power = FB_BLANK_UNBLANK;
         bd->props->update_status(bd);
-        down(&bd->sem);
+        up(&bd->sem);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         mutex_lock(&pmac_backlight_mutex);
@@ -2812,7 +2816,7 @@ static int atyfb_blank(int blank, struct fb_info *info)
         if (par->lock_blank || par->asleep)
                 return 0;
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+#ifdef CONFIG_FB_ATY_BACKLIGHT
         if (machine_is(powermac) && blank > FB_BLANK_NORMAL)
                 aty_bl_set_power(info, FB_BLANK_POWERDOWN);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
@@ -2844,7 +2848,7 @@ static int atyfb_blank(int blank, struct fb_info *info)
         }
         aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+#ifdef CONFIG_FB_ATY_BACKLIGHT
         if (machine_is(powermac) && blank <= FB_BLANK_NORMAL)
                 aty_bl_set_power(info, FB_BLANK_UNBLANK);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)