Unverified Commit 7a3c36ee authored by Stuart Hayhurst's avatar Stuart Hayhurst Committed by Ilpo Järvinen
Browse files

platform/x86: ideapad-laptop: Set max_brightness before using it 



max_brightness is used in ideapad_kbd_bl_brightness_get() before it's set,
causing ideapad_kbd_bl_brightness_get() to return -EINVAL sometimes.

Fixes: ecaa1867 ("platform/x86: ideapad-laptop: Add support for keyboard backlights using KBLC ACPI symbol")
Signed-off-by: default avatarStuart Hayhurst <stuart.a.hayhurst@gmail.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231114114055.6220-2-stuart.a.hayhurst@gmail.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 9fadd450

drivers/platform/x86/ideapad-laptop.c

+5 −6
Original line number Diff line number Diff line
@@ -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;