openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

platform/x86: thinkpad_acpi: correct palmsensor error checking 

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>
This commit is contained in:
Mark Pearson 2020-12-29 21:47:26 -05:00 committed by Hans de Goede
parent fcd38f178b
commit aa44afab87
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/platform/x86/thinkpad_acpi.c
View File

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