diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2022-08-25 17:13:34 +0300 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2022-08-26 13:59:01 +0300 |
| commit | 83ac7a1c2ed5f17caa07cbbc84bad3c05dc3bf22 (patch) | |
| tree | 29e2b564377c1c9ec179a9128c3fcd0620d308f3 /drivers/platform/x86/msi-laptop.c | |
| parent | 6485f72b515690bdbebc711755af096d1dc08ce2 (diff) | |
| download | linux-83ac7a1c2ed5f17caa07cbbc84bad3c05dc3bf22.tar.xz | |
platform/x86: msi-laptop: Fix old-ec check for backlight registering
Commit 2cc6c717799f ("msi-laptop: Port to new backlight interface
selection API") replaced this check:
if (!quirks->old_ec_model || acpi_video_backlight_support())
pr_info("Brightness ignored, ...");
else
do_register();
With:
if (quirks->old_ec_model ||
acpi_video_get_backlight_type() == acpi_backlight_vendor)
do_register();
But since the do_register() part was part of the else branch, the entire
condition should be inverted. So not only the 2 statements on either
side of the || should be inverted, but the || itself should be replaced
with a &&.
In practice this has likely not been an issue because the new-ec models
(old_ec_model==false) likely all support ACPI video backlight control,
making acpi_video_get_backlight_type() return acpi_backlight_video
turning the second part of the || also false when old_ec_model == false.
Fixes: 2cc6c717799f ("msi-laptop: Port to new backlight interface selection API")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220825141336.208597-1-hdegoede@redhat.com
Diffstat (limited to 'drivers/platform/x86/msi-laptop.c')
| -rw-r--r-- | drivers/platform/x86/msi-laptop.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 93ef8851b93e..54170172a666 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -1047,8 +1047,7 @@ static int __init msi_init(void) return -EINVAL; /* Register backlight stuff */ - - if (quirks->old_ec_model || + if (quirks->old_ec_model && acpi_video_get_backlight_type() == acpi_backlight_vendor) { struct backlight_properties props; memset(&props, 0, sizeof(struct backlight_properties)); |