Skip to contentSkip to conversation

platform/x86: asus-wmi: fix TUF laptop RGB variant

PATCH In review Luke D. Jones 3 participants 5 messages Jul 16, 2024

Subsystems (2)
lore
Share & tools
lore
author maintainer
#1 lore raw

PATCH 1/1 platform/x86: asus-wmi: fix TUF laptop RGB variant

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")
---
 drivers/platform/x86/asus-wmi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/platform/x86/asus-wmi.c +5 -1
index 7d87ff68f418..2b968003cb9b 100644
@@ -906,10 +906,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;
 
Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#2 lore raw

Hi,

Quoted 9 lines · Luke D. Jones

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")

Thanks, patch looks good to me:

Regards,

Hans

Quoted 24 lines
---
 drivers/platform/x86/asus-wmi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/platform/x86/asus-wmi.c +5 -1
index 7d87ff68f418..2b968003cb9b 100644
@@ -906,10 +906,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;
 
maintainer
#3 lore raw
In reply to Luke D. Jones
Quoted 22 lines · Luke D. Jones

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")
---
 drivers/platform/x86/asus-wmi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/platform/x86/asus-wmi.c +0 -1
index 7d87ff68f418..2b968003cb9b 100644
@@ -906,10 +906,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);

drivers/platform/x86/asus-wmi.c static ssize_t kbd_rgb_mode_store(struct device *dev, · line 918

Quoted 10 lines
drivers/platform/x86/asus-wmi.c +5 -0
 	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;

Thanks. Applied to review-ilpo / for-next and will go into Linus in the main PR for 6.11.

Signature · 1 line
 i.