6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Denis Benato [ Upstream commit fd83d81ddf058d487e6d6489b18094f068e66a59 ] The bd->props.power is checked in parts of the driver correctly comparing with BACKLIGHT_POWER_ON, while in others with a raw usage of bd->props.power and !bd->props.power, moreover in certain checks the logic has been inverted due to BACKLIGHT_POWER_ON being defined as 0: fix both the wrong usage and the inconsistencies by using proper comparisons. Fixes: 130d29c5627c ("platform/x86: asus-wmi: adjust screenpad power/brightness handling") Closes: https://lore.kernel.org/all/178362762638.911488.8564892548331679884@eldamar.lan/ Closes: https://lore.kernel.org/all/ea9c63d1-4776-49d5-9dc4-6c09498f99c9@linux.dev/ Tested-by: Hugo Baigue Tested-by: Ponali Cc: stable@vger.kernel.org Assisted-by: zcode:glm-5.3-flash Signed-off-by: Denis Benato Link: https://patch.msgid.link/20260916143838.170950-2-denis.benato@linux.dev Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- drivers/platform/x86/asus-wmi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 9f0f79030b5b8..adff9f49b5677 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -4156,7 +4156,8 @@ static int update_screenpad_bl_status(struct backlight_device *bd) u32 ctrl_param = bd->props.brightness; int err = 0; - if (bd->props.power) { + switch (bd->props.power) { + case BACKLIGHT_POWER_ON: err = asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_POWER, 1, NULL); if (err < 0) return err; @@ -4164,12 +4165,17 @@ static int update_screenpad_bl_status(struct backlight_device *bd) err = asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_LIGHT, ctrl_param, NULL); if (err < 0) return err; - } + break; - if (!bd->props.power) { + case BACKLIGHT_POWER_OFF: err = asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_POWER, 0, NULL); if (err < 0) return err; + break; + + default: + pr_warn("Invalid screenpad backlight power state: %d\n", bd->props.power); + return -EINVAL; } return err; -- 2.53.0