aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-11-27 17:52:10 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-11-27 17:52:10 -0500
commitf77383efbe4525c66a84b834297d3a133c59b132 (patch)
tree8a3257b1f25a28a5c53b9db376ae65e24a1ef23c
parente6cf7518037a827dc4c8b2e7690dd03ba742603b (diff)
parent370ab92a1eaf673bae8766943cf6700c083bcaae (diff)
downloadlinux-yocto-f77383efbe4525c66a84b834297d3a133c59b132.tar.gz
linux-yocto-f77383efbe4525c66a84b834297d3a133c59b132.tar.bz2
linux-yocto-f77383efbe4525c66a84b834297d3a133c59b132.zip
Merge branch 'v5.2/standard/base' into v5.2/standard/fsl-mpc8315e-rdb
-rw-r--r--drivers/platform/x86/wmi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 22f4b92c5da4..a719acac6031 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1307,7 +1307,7 @@ static int acpi_wmi_remove(struct platform_device *device)
acpi_remove_address_space_handler(acpi_device->handle,
ACPI_ADR_SPACE_EC, &acpi_wmi_ec_space_handler);
wmi_free_devices(acpi_device);
- device_destroy(&wmi_bus_class, MKDEV(0, 0));
+ device_unregister((struct device *)dev_get_drvdata(&device->dev));
return 0;
}
@@ -1361,7 +1361,7 @@ static int acpi_wmi_probe(struct platform_device *device)
return 0;
err_remove_busdev:
- device_destroy(&wmi_bus_class, MKDEV(0, 0));
+ device_unregister(wmi_bus_dev);
err_remove_notify_handler:
acpi_remove_notify_handler(acpi_device->handle, ACPI_DEVICE_NOTIFY,