aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/asus-laptop.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/asus-laptop.c')
-rw-r--r--drivers/misc/asus-laptop.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index d15ee5e34201..7ace5b9a3d28 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -348,13 +348,8 @@ static void lcd_blank(int blank)
348 struct backlight_device *bd = asus_backlight_device; 348 struct backlight_device *bd = asus_backlight_device;
349 349
350 if (bd) { 350 if (bd) {
351 down(&bd->sem); 351 bd->props->power = blank;
352 if (likely(bd->props)) { 352 backlight_update_status(bd);
353 bd->props->power = blank;
354 if (likely(bd->props->update_status))
355 bd->props->update_status(bd);
356 }
357 up(&bd->sem);
358 } 353 }
359} 354}
360 355
@@ -1028,14 +1023,9 @@ static int asus_backlight_init(struct device *dev)
1028 1023
1029 asus_backlight_device = bd; 1024 asus_backlight_device = bd;
1030 1025
1031 down(&bd->sem); 1026 bd->props->brightness = read_brightness(NULL);
1032 if (likely(bd->props)) { 1027 bd->props->power = FB_BLANK_UNBLANK;
1033 bd->props->brightness = read_brightness(NULL); 1028 backlight_update_status(bd);
1034 bd->props->power = FB_BLANK_UNBLANK;
1035 if (likely(bd->props->update_status))
1036 bd->props->update_status(bd);
1037 }
1038 up(&bd->sem);
1039 } 1029 }
1040 return 0; 1030 return 0;
1041} 1031}