aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-20 11:37:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-20 11:37:30 -0700
commitde87dcdedc133c1368566250e251ed1a6335e001 (patch)
tree867718998725d39e4a09206b285384d8ae978f71
parentMerge tag 'arc-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc (diff)
parentplatform/x86: dell-laptop: Fix backlight detection (diff)
downloadlinux-dev-de87dcdedc133c1368566250e251ed1a6335e001.tar.xz
linux-dev-de87dcdedc133c1368566250e251ed1a6335e001.zip
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.c2
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)
dell_fill_request(&buffer, token->location, 0, 0, 0);
ret = dell_send_request(&buffer,
CLASS_TOKEN_READ, SELECT_TOKEN_AC);
- if (ret)
+ if (ret == 0)
max_intensity = buffer.output[3];
}