Commit e0d6f3b6 authored Dec 13, 2022 by Hans de Goede Committed by Greg Kroah-Hartman Jan 18, 2023

platform/x86: sony-laptop: Don't turn off 0x153 keyboard backlight during probe

commit ad75bd85b1db69c97eefea07b375567821f6ef58 upstream.

The 0x153 version of the kbd backlight control SNC handle has no separate
address to probe if the backlight is there.

This turns the probe call into a set keyboard backlight call with a value
of 0 turning off the keyboard backlight.

Skip probing when there is no separate probe address to avoid this.

Link: https://bugzilla.redhat.com/show_bug.cgi?id=1583752


Fixes: 800f2017 ("Keyboard backlight control for some Vaio Fit models")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Mattia Dongili <malattia@linux.it>
Link: https://lore.kernel.org/r/20221213122943.11123-1-hdegoede@redhat.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1ad759df

drivers/platform/x86/sony-laptop.c

+14 −7

Original line number	Diff line number	Diff line
		@@ -1899,6 +1899,12 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd,
		break;
		}

		/*
		* Only probe if there is a separate probe_base, otherwise the probe call
		* is equivalent to __sony_nc_kbd_backlight_mode_set(0), resulting in
		* the keyboard backlight being turned off.
		*/
		if (probe_base) {
		ret = sony_call_snc_handle(handle, probe_base, &result);
		if (ret)
		return ret;
		@@ -1908,6 +1914,7 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd,
		dprintk("no backlight keyboard found\n");
		return 0;
		}
		}

		kbdbl_ctl = kzalloc(sizeof(*kbdbl_ctl), GFP_KERNEL);
		if (!kbdbl_ctl)