From: Armin Wolf <W_Armin@gmx.de>
To: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com
Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] platform/x86: wmi: Initialize ACPI device class
Date: Wed, 24 Jan 2024 20:07:32 +0100 [thread overview]
Message-ID: <20240124190732.4795-1-W_Armin@gmx.de> (raw)
When an ACPI netlink event is received by acpid, the ACPI device
class is passed as its first argument. But since the class string
is not initialized, an empty string is being passed:
netlink: PNP0C14:01 000000d0 00000000
Fix this by initializing the ACPI device class during probe.
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
---
Note: This patch is based on commit 3f399b5d7189 ("platform/x86: wmi: Use ACPI device name in netlink event")
---
drivers/platform/x86/wmi.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 7ef1e82dc61c..b92425c30a50 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -32,6 +32,8 @@
#include <linux/wmi.h>
#include <linux/fs.h>
+#define ACPI_WMI_DEVICE_CLASS "wmi"
+
MODULE_AUTHOR("Carlos Corbacho");
MODULE_DESCRIPTION("ACPI-WMI Mapping Driver");
MODULE_LICENSE("GPL");
@@ -1202,7 +1204,7 @@ static int wmi_notify_device(struct device *dev, void *data)
wblock->handler(*event, wblock->handler_data);
}
- acpi_bus_generate_netlink_event(wblock->acpi_device->pnp.device_class,
+ acpi_bus_generate_netlink_event(acpi_device_class(wblock->acpi_device),
acpi_dev_name(wblock->acpi_device), *event, 0);
return -EBUSY;
@@ -1267,6 +1269,8 @@ static int acpi_wmi_probe(struct platform_device *device)
return -ENODEV;
}
+ strscpy(acpi_device_class(acpi_device), ACPI_WMI_DEVICE_CLASS, sizeof(acpi_device_class));
+
wmi_bus_dev = device_create(&wmi_bus_class, &device->dev, MKDEV(0, 0), NULL, "wmi_bus-%s",
dev_name(&device->dev));
if (IS_ERR(wmi_bus_dev))
--
2.39.2
next reply other threads:[~2024-01-24 19:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-24 19:07 Armin Wolf [this message]
2024-01-29 12:51 ` Hans de Goede
2024-01-29 13:08 ` Rafael J. Wysocki
2024-01-30 2:10 ` Armin Wolf
2024-01-30 9:17 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240124190732.4795-1-W_Armin@gmx.de \
--to=w_armin@gmx.de \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®