]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
platform/x86: thinkpad_acpi: correct palmsensor error checking
authorMark Pearson <markpearson@lenovo.com>
Wed, 30 Dec 2020 02:47:26 +0000 (21:47 -0500)
committerHans de Goede <hdegoede@redhat.com>
Mon, 4 Jan 2021 14:55:30 +0000 (15:55 +0100)
The previous commit adding functionality for the palm sensor had a
mistake which meant the error conditions on initialisation was not checked
correctly. On some older platforms this meant that if the sensor wasn't
available an error would be returned and the driver would fail to load.

This commit corrects the error condition. Many thanks to Mario Oenning
for reporting and determining the issue

Signed-off-by: Mark Pearson <markpearson@lenovo.com>
Link: https://lore.kernel.org/r/20201230024726.7861-1-markpearson@lenovo.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
drivers/platform/x86/thinkpad_acpi.c

index e03df2881dc6dfff51ebbd366892fd6f4c1f96e5..c102657b3eb32a49d2fe04d44e597b30644ec5d5 100644 (file)
@@ -9951,9 +9951,9 @@ static int tpacpi_proxsensor_init(struct ibm_init_struct *iibm)
        if ((palm_err == -ENODEV) && (lap_err == -ENODEV))
                return 0;
        /* Otherwise, if there was an error return it */
-       if (palm_err && (palm_err != ENODEV))
+       if (palm_err && (palm_err != -ENODEV))
                return palm_err;
-       if (lap_err && (lap_err != ENODEV))
+       if (lap_err && (lap_err != -ENODEV))
                return lap_err;
 
        if (has_palmsensor) {