diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-31 09:10:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-31 09:10:03 +0200 |
| commit | 92722bac5fe4dc4582282bad02dd1fb95e892705 (patch) | |
| tree | 669a7eac6392b08965cbb5be456b9881aeb30b96 /drivers/platform/x86/dell | |
| parent | 39b27e89a76f3827ad93aed9213a6daf2b91f819 (diff) | |
| parent | 8124c8a6b35386f73523d27eacb71b5364a68c4c (diff) | |
| download | linux-next-92722bac5fe4dc4582282bad02dd1fb95e892705.tar.gz linux-next-92722bac5fe4dc4582282bad02dd1fb95e892705.zip | |
Merge 5.13-rc4 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/x86/dell')
| -rw-r--r-- | drivers/platform/x86/dell/dell-smbios-wmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/dell/dell-smbios-wmi.c b/drivers/platform/x86/dell/dell-smbios-wmi.c index a1753485159c..33f823772733 100644 --- a/drivers/platform/x86/dell/dell-smbios-wmi.c +++ b/drivers/platform/x86/dell/dell-smbios-wmi.c @@ -270,7 +270,8 @@ int init_dell_smbios_wmi(void) void exit_dell_smbios_wmi(void) { - wmi_driver_unregister(&dell_smbios_wmi_driver); + if (wmi_supported) + wmi_driver_unregister(&dell_smbios_wmi_driver); } MODULE_DEVICE_TABLE(wmi, dell_smbios_wmi_id_table); |