]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
platform/x86: asus-wmi: fix TUF laptop RGB variant
authorLuke D. Jones <luke@ljones.dev>
Tue, 16 Jul 2024 01:11:30 +0000 (13:11 +1200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Aug 2024 07:00:05 +0000 (09:00 +0200)
[ Upstream commit d8b17a364ec48239fccb65efe74bb485e79e6743 ]

In kbd_rgb_mode_store the dev_get_drvdata() call was assuming the device
data was asus_wmi when it was actually led_classdev.

This patch corrects this by making the correct chain of calls to get the
asus_wmi driver data.

Fixes: ae834a549ec1 ("platform/x86: asus-wmi: add support variant of TUF RGB")
Tested-by: Denis Benato <benato.denis96@gmail.com>
Signed-off-by: Luke D. Jones <luke@ljones.dev>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240716011130.17464-2-luke@ljones.dev
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/platform/x86/asus-wmi.c

index 3f9b6285c9a66f31fbf8756cb56f6e384112fd07..bc9c5db38324453cdce3cc5fec90afaed0be11c9 100644 (file)
@@ -879,10 +879,14 @@ static ssize_t kbd_rgb_mode_store(struct device *dev,
                                 struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
-       struct asus_wmi *asus = dev_get_drvdata(dev);
        u32 cmd, mode, r, g, b, speed;
+       struct led_classdev *led;
+       struct asus_wmi *asus;
        int err;
 
+       led = dev_get_drvdata(dev);
+       asus = container_of(led, struct asus_wmi, kbd_led);
+
        if (sscanf(buf, "%d %d %d %d %d %d", &cmd, &mode, &r, &g, &b, &speed) != 6)
                return -EINVAL;