Skip to contentSkip to conversation

Fixes: ae834a549ec1 ("platform/x86: asus-wmi: add support variant of TUF RGB")

PATCH In review Luke D. Jones 2 participants 3 messages Jul 13, 2024 – Jul 16, 2024

Subsystems (2)
lore
Share & tools
lore

Luke D. Jones

author maintainer
#0 lore raw

PATCH 1/1 Fixes: ae834a549ec1 ("platform/x86: asus-wmi: add support variant of TUF RGB")

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.

---
 drivers/platform/x86/asus-wmi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/platform/x86/asus-wmi.c +5 -1
index 799d928c7d3d..2935af013535 100644
@@ -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;
 
Signature · 1 line
2.45.2
maintainer
#1 lore raw
Quoted 8 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.

Your tags seem messed up, Fixes is in Subject in place of shortlog that is completely missing.

Could you please correct these issues and resubmit, thank you.

Signature · 1 line
 i.
Quoted 25 lines
---
 drivers/platform/x86/asus-wmi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/platform/x86/asus-wmi.c +5 -1
index 799d928c7d3d..2935af013535 100644
@@ -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;
 
author maintainer
#2 lore raw
Quoted 8 lines · Ilpo Järvinen
Quoted 6 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.

Quoted 7 lines
Quoted 2 lines

Your tags seem messed up, Fixes is in Subject in place of shortlog that is completely missing.

Could you please correct these issues and resubmit, thank you.

Looks like I misunderstood something somewhere. Will resubmit.

Quoted 30 lines
Signature · 2 lines
-- 
i.
Quoted 25 lines
---
 drivers/platform/x86/asus-wmi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/platform/x86/asus-wmi.c +5 -1
index 799d928c7d3d..2935af013535 100644
@@ -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;