diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-20 14:37:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-20 14:37:30 -0400 |
| commit | de87dcdedc133c1368566250e251ed1a6335e001 (patch) | |
| tree | 867718998725d39e4a09206b285384d8ae978f71 | |
| parent | 2a0ea7df1ffb6bb46a8cf9b4d6f0bfca1e93a761 (diff) | |
| parent | 2502e5a025935b7b476b69eda4959b3c4022c72b (diff) | |
Merge tag 'platform-drivers-x86-v4.18-2' of git://git.infradead.org/linux-platform-drivers-x86
Pull x86 platform driver fixes from Andy Shevchenko:
"The Dell laptop ACPI video brightness control is now back after fixing
a regression brought by SMM refactoring"
* tag 'platform-drivers-x86-v4.18-2' of git://git.infradead.org/linux-platform-drivers-x86:
platform/x86: dell-laptop: Fix backlight detection
| -rw-r--r-- | drivers/platform/x86/dell-laptop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index f1fa8612db40..06978c14c83b 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c | |||
| @@ -2185,7 +2185,7 @@ static int __init dell_init(void) | |||
| 2185 | dell_fill_request(&buffer, token->location, 0, 0, 0); | 2185 | dell_fill_request(&buffer, token->location, 0, 0, 0); |
| 2186 | ret = dell_send_request(&buffer, | 2186 | ret = dell_send_request(&buffer, |
| 2187 | CLASS_TOKEN_READ, SELECT_TOKEN_AC); | 2187 | CLASS_TOKEN_READ, SELECT_TOKEN_AC); |
| 2188 | if (ret) | 2188 | if (ret == 0) |
| 2189 | max_intensity = buffer.output[3]; | 2189 | max_intensity = buffer.output[3]; |
| 2190 | } | 2190 | } |
| 2191 | 2191 | ||