summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-11-23 21:56:16 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-11-23 21:56:16 +0300
commita03bac580ae743d5900af626ac63f7f8cd85def9 (patch)
treefc6a805dd06558b6e3327d4b2ac2d61df04cffe1
parentb88af994872418f0a98db6f4a9bae849315a99b0 (diff)
parent2bbb5fa37475d7aa5fa62f34db1623f3da2dfdfa (diff)
downloadlinux-a03bac580ae743d5900af626ac63f7f8cd85def9.tar.xz
Merge tag 'acpi-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki: "Prevent the ACPI core from registering a platform device for the SMB0001 HID to avoid IRQ allocation issues (Hans de Goede)" * tag 'acpi-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / platform: Add SMB0001 HID to forbidden_id_list
-rw-r--r--drivers/acpi/acpi_platform.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index eaa60c94205a..1f32caa87686 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -30,6 +30,7 @@ static const struct acpi_device_id forbidden_id_list[] = {
{"PNP0200", 0}, /* AT DMA Controller */
{"ACPI0009", 0}, /* IOxAPIC */
{"ACPI000A", 0}, /* IOAPIC */
+ {"SMB0001", 0}, /* ACPI SMBUS virtual device */
{"", 0},
};