xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/x86: huawei-wmi: fix return value calculation

Browse Source 
[ Upstream commit 0b9a1dcdb6a2c841899389bf2dd7a3e0e2aa0e99 ]

Previously, `huawei_wmi_input_setup()` returned the result of
logical or-ing the return values of two functions that return negative
errno-style error codes and one that returns `acpi_status`. If this
returned value was non-zero, then it was propagated from the platform
driver's probe function. That function should return a negative
errno-style error code, so the result of the logical or that
`huawei_wmi_input_setup()` returned was not appropriate.

Fix that by checking each function separately and returning the
error code unmodified.

Fixes: 1ac9abeb2e ("platform/x86: huawei-wmi: Move to platform driver")
Signed-off-by: Barnabás Pőcze <pobrn@protonmail.com>
Link: https://lore.kernel.org/r/20221005150032.173198-2-pobrn@protonmail.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Barnabás Pőcze
2022-10-05 15:00:45 +00:00
committed by Greg Kroah-Hartman
parent a1014fbc83
commit 2f2ae35c00
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/platform/x86/huawei-wmi.c
View File

@@ -760,6 +760,9 @@ static int huawei_wmi_input_setup(struct device *dev,
const char *guid, const char *guid,
struct input_dev **idev) struct input_dev **idev)
{ {
acpi_status status;
int err;
*idev = devm_input_allocate_device(dev); *idev = devm_input_allocate_device(dev);
if (!*idev) if (!*idev)
return -ENOMEM; return -ENOMEM;
@@ -769,10 +772,19 @@ static int huawei_wmi_input_setup(struct device *dev,
(*idev)->id.bustype = BUS_HOST; (*idev)->id.bustype = BUS_HOST;
(*idev)->dev.parent = dev; (*idev)->dev.parent = dev;
return sparse_keymap_setup(*idev, huawei_wmi_keymap, NULL) || err = sparse_keymap_setup(*idev, huawei_wmi_keymap, NULL);
input_register_device(*idev) || if (err)
wmi_install_notify_handler(guid, huawei_wmi_input_notify, return err;
*idev);
err = input_register_device(*idev);
if (err)
return err;
status = wmi_install_notify_handler(guid, huawei_wmi_input_notify, *idev);
if (ACPI_FAILURE(status))
return -EIO;
return 0;
} }
static void huawei_wmi_input_exit(struct device *dev, const char *guid) static void huawei_wmi_input_exit(struct device *dev, const char *guid)