[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20231112152851.17687-2-stuart.a.hayhurst@gmail.com>
Date: Sun, 12 Nov 2023 15:27:53 +0000
From: Stuart Hayhurst <stuart.a.hayhurst@...il.com>
To: platform-driver-x86@...r.kernel.org
Cc: Stuart Hayhurst <stuart.a.hayhurst@...il.com>,
linux-kernel@...r.kernel.org, Mark Gross <markgross@...nel.org>,
Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
Hans de Goede <hdegoede@...hat.com>,
Ike Panhc <ike.pan@...onical.com>
Subject: [PATCH] platform/x86: ideapad-laptop: Set max_brightness before using it
max_brightness would be used in ideapad_kbd_bl_brightness_get() before it was
set, causing ideapad_kbd_bl_brightness_get() to return -EINVAL sometimes
Signed-off-by: Stuart Hayhurst <stuart.a.hayhurst@...il.com>
---
drivers/platform/x86/ideapad-laptop.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index ac037540acfc..88eefccb6ed2 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -1425,18 +1425,17 @@ static int ideapad_kbd_bl_init(struct ideapad_private *priv)
if (WARN_ON(priv->kbd_bl.initialized))
return -EEXIST;
- brightness = ideapad_kbd_bl_brightness_get(priv);
- if (brightness < 0)
- return brightness;
-
- priv->kbd_bl.last_brightness = brightness;
-
if (ideapad_kbd_bl_check_tristate(priv->kbd_bl.type)) {
priv->kbd_bl.led.max_brightness = 2;
} else {
priv->kbd_bl.led.max_brightness = 1;
}
+ brightness = ideapad_kbd_bl_brightness_get(priv);
+ if (brightness < 0)
+ return brightness;
+
+ priv->kbd_bl.last_brightness = brightness;
priv->kbd_bl.led.name = "platform::" LED_FUNCTION_KBD_BACKLIGHT;
priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get;
priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set;
--
2.42.0
Powered by blists - more mailing lists