platform/x86: ideapad-laptop: Set max_brightness before using it
Subsystems (2)
PATCH 1/1 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
--- drivers/platform/x86/ideapad-laptop.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/platform/x86/ideapad-laptop.c +5 -6
@@ -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;
Signature · 1 line
2.42.0
Ilpo Järvinen
maintainerQuoted 2 lines · Stuart Hayhurst
max_brightnesswould be used inideapad_kbd_bl_brightness_get()before it was set, causingideapad_kbd_bl_brightness_get()to return-EINVALsometimes
... is used ... is set ...
Quoted 1 line
Signed-off-by Stuart Hayhurst <[email protected]>
This lacks Fixes: + stable cc tags.
The code change seems fine.
Signature · 1 line
i.
Quoted 33 lines
--- drivers/platform/x86/ideapad-laptop.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)drivers/platform/x86/ideapad-laptop.c +5
-6@@ -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;
PATCH v2 1/1 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
---
Sorry if I messed up the stable cc bit, I have no idea how that process works
v1 -> v2:
- Fix commit message
- Add missing tags
--- drivers/platform/x86/ideapad-laptop.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/platform/x86/ideapad-laptop.c +5 -6
@@ -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;
Signature · 1 line
2.42.0
Quoted 9 lines · Stuart Hayhurst
max_brightnessis used inideapad_kbd_bl_brightness_get()before it's set, causingideapad_kbd_bl_brightness_get()to return-EINVALsometimesFixes ecaa1867b524 ("platform/x86: ideapad-laptop: Add support for keyboard backlights using KBLC ACPI symbol")Signed-off-by Stuart Hayhurst <[email protected]>---
Sorry if I messed up the stable cc bit, I have no idea how that process works
It looks fine now, thank you (except for the . missing at the end of the sentence but I can fix that when I'll later apply the patch).
Signature · 1 line
i.
Quoted 37 lines
v1 -> v2:
- Fix commit message
- Add missing tags--- drivers/platform/x86/ideapad-laptop.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)drivers/platform/x86/ideapad-laptop.c +5
-6@@ -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;
Ilpo Järvinen
maintainerQuoted 4 lines · Stuart Hayhurst
max_brightnessis used inideapad_kbd_bl_brightness_get()before it's set, causingideapad_kbd_bl_brightness_get()to return-EINVALsometimes
Thank you for your contribution, it has been applied to my local review-ilpo branch. Note it will show up in the public platform-drivers-x86/review-ilpo branch only once I've pushed my local branch there, which might take a while.
The list of commits applied:
[1/1] platform/x86: ideapad-laptop: Set max_brightness before using it
commit: 7a3c36eef9a5d13b16aa954da54224c9c6bed339
--
i.