Pull x86 platform driver fixes from Darren Hart: - We missed a case in the Dell config dependencies resulting in a possible bad configuration, resolve it by giving up on trying to keep DELL_LAPTOP visible in the menu and make it depend on DELL_SMBIOS. - Fix a null pointer dereference at module unload for the asus-wireless driver. * tag 'platform-drivers-x86-v4.17-2' of git://git.infradead.org/linux-platform-drivers-x86: platform/x86: Kconfig: Fix dell-laptop dependency chain. platform/x86: asus-wireless: Fix NULL pointer dereference
Unified · Split
| @@ -154,7 +154,7 @@ config DELL_LAPTOP · 153 unmodified lines | |||
| 154 | depends on ACPI_VIDEO || ACPI_VIDEO = n | 154 | depends on ACPI_VIDEO || ACPI_VIDEO = n |
| 155 | depends on RFKILL || RFKILL = n | 155 | depends on RFKILL || RFKILL = n |
| 156 | depends on SERIO_I8042 | 156 | depends on SERIO_I8042 |
| 157 | select DELL_SMBIOS | 157 | depends on DELL_SMBIOS |
| 158 | select POWER_SUPPLY | 158 | select POWER_SUPPLY |
| 159 | select LEDS_CLASS | 159 | select LEDS_CLASS |
| 160 | select NEW_LEDS | 160 | select NEW_LEDS |
| @@ -178,8 +178,10 @@ static int asus_wireless_remove(struct acpi_device *adev) · 177 unmodified lines | |||
| 178 | { | 178 | { |
| 179 | struct asus_wireless_data *data = acpi_driver_data(adev); | 179 | struct asus_wireless_data *data = acpi_driver_data(adev); |
| 180 | 180 | ||
| 181 | if (data->wq) | 181 | if (data->wq) { |
| 182 | devm_led_classdev_unregister(&adev->dev, &data->led); | ||
| 182 | destroy_workqueue(data->wq); | 183 | destroy_workqueue(data->wq); |
| 184 | } | ||
| 183 | return 0; | 185 | return 0; |
| 184 | } | 186 | } |
| 185 | 187 | ||