Skip to content

Commit

Permalink
Merge tag 'platform-drivers-x86-v4.14-2' of git://git.infradead.org/l…
Browse files Browse the repository at this point in the history
…inux-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
  • Loading branch information
torvalds committed Sep 30, 2017
2 parents 95dcc4d + ce7c47d commit 74d83ec
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/platform/x86/fujitsu-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,12 @@ static int bl_update_status(struct backlight_device *b)
{
struct acpi_device *device = bl_get_data(b);

if (b->props.power == FB_BLANK_POWERDOWN)
call_fext_func(fext, FUNC_BACKLIGHT, 0x1, 0x4, 0x3);
else
call_fext_func(fext, FUNC_BACKLIGHT, 0x1, 0x4, 0x0);
if (fext) {
if (b->props.power == FB_BLANK_POWERDOWN)
call_fext_func(fext, FUNC_BACKLIGHT, 0x1, 0x4, 0x3);
else
call_fext_func(fext, FUNC_BACKLIGHT, 0x1, 0x4, 0x0);
}

return set_lcd_level(device, b->props.brightness);
}
Expand Down

0 comments on commit 74d83ec

Please sign in to comment.