iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asus-wmi: don't update power and brightness when using scalar

Browse Source 
But we can still do it on other boards, as this might happen
if the backlight driver change when update_bl is called.

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Corentin Chary 2012-03-20 09:53:14 +01:00 committed by Matthew Garrett
parent 7a61d02074
commit ade28abdcb
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/platform/x86/asus-wmi.c
View File

@ -1152,7 +1152,13 @@ static int update_bl_status(struct backlight_device *bd)
ctrl_param, NULL); ctrl_param, NULL);
if (asus->driver->quirks->store_backlight_power) if (asus->driver->quirks->store_backlight_power)
asus->driver->panel_power = bd->props.power; asus->driver->panel_power = bd->props.power;
} else {
/* When using scalar brightness, updating the brightness
* will mess with the backlight power */
if (asus->driver->quirks->scalar_panel_brightness)
return err;
}
if (asus->driver->quirks->scalar_panel_brightness) if (asus->driver->quirks->scalar_panel_brightness)
ctrl_param = get_scalar_command(bd); ctrl_param = get_scalar_command(bd);
else else
@ -1160,7 +1166,7 @@ static int update_bl_status(struct backlight_device *bd)
err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BRIGHTNESS, err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BRIGHTNESS,
ctrl_param, NULL); ctrl_param, NULL);
}
return err; return err;
} }