Commit 74d83ec2 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'platform-drivers-x86-v4.14-2' of git://git.infradead.org/linux-platform-drivers-x86

Pull x86 platform drivers fix from Darren Hart:
 "Newly discovered species of fujitsu laptops break some assumptions
  about ACPI device pairings.

  fujitsu-laptop: Don't oops when FUJ02E3 is not present"

* tag 'platform-drivers-x86-v4.14-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: fujitsu-laptop: Don't oops when FUJ02E3 is not presnt
parents 95dcc4dc ce7c47d6
...@@ -254,10 +254,12 @@ static int bl_update_status(struct backlight_device *b) ...@@ -254,10 +254,12 @@ static int bl_update_status(struct backlight_device *b)
{ {
struct acpi_device *device = bl_get_data(b); struct acpi_device *device = bl_get_data(b);
if (b->props.power == FB_BLANK_POWERDOWN) if (fext) {
call_fext_func(fext, FUNC_BACKLIGHT, 0x1, 0x4, 0x3); if (b->props.power == FB_BLANK_POWERDOWN)
else call_fext_func(fext, FUNC_BACKLIGHT, 0x1, 0x4, 0x3);
call_fext_func(fext, FUNC_BACKLIGHT, 0x1, 0x4, 0x0); else
call_fext_func(fext, FUNC_BACKLIGHT, 0x1, 0x4, 0x0);
}
return set_lcd_level(device, b->props.brightness); return set_lcd_level(device, b->props.brightness);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment