Patch "platform/x86: huawei-wmi: fix return value calculation" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

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

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     platform-x86-huawei-wmi-fix-return-value-calculation.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 59ee80436a8fc3e60f2d89a837ec6f9fc86f853b
Author: Barnabás Pőcze <pobrn@xxxxxxxxxxxxxx>
Date:   Wed Oct 5 15:00:45 2022 +0000

    platform/x86: huawei-wmi: fix return value calculation
    
    [ 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: 1ac9abeb2e5b ("platform/x86: huawei-wmi: Move to platform driver")
    Signed-off-by: Barnabás Pőcze <pobrn@xxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20221005150032.173198-2-pobrn@xxxxxxxxxxxxxx
    Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/platform/x86/huawei-wmi.c b/drivers/platform/x86/huawei-wmi.c
index eac3e6b4ea11..935562c870c3 100644
--- a/drivers/platform/x86/huawei-wmi.c
+++ b/drivers/platform/x86/huawei-wmi.c
@@ -760,6 +760,9 @@ static int huawei_wmi_input_setup(struct device *dev,
 		const char *guid,
 		struct input_dev **idev)
 {
+	acpi_status status;
+	int err;
+
 	*idev = devm_input_allocate_device(dev);
 	if (!*idev)
 		return -ENOMEM;
@@ -769,10 +772,19 @@ static int huawei_wmi_input_setup(struct device *dev,
 	(*idev)->id.bustype = BUS_HOST;
 	(*idev)->dev.parent = dev;
 
-	return sparse_keymap_setup(*idev, huawei_wmi_keymap, NULL) ||
-		input_register_device(*idev) ||
-		wmi_install_notify_handler(guid, huawei_wmi_input_notify,
-				*idev);
+	err = sparse_keymap_setup(*idev, huawei_wmi_keymap, NULL);
+	if (err)
+		return err;
+
+	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)