blob: c6b1b06036510a773cad6e069dc59d1e43c3e37b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 791449a2370f..45d9010aafcf 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1081,7 +1081,8 @@ static int wmi_create_device(struct device *wmi_bus_dev,
wblock->dev.dev.bus = &wmi_bus_type;
wblock->dev.dev.parent = wmi_bus_dev;
- dev_set_name(&wblock->dev.dev, "%pUL", gblock->guid);
+ dev_set_name(&wblock->dev.dev, "%s-%pUL",
+ dev_name(&wblock->acpi_device->dev), gblock->guid);
device_initialize(&wblock->dev.dev);
|