diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-12-06 11:29:39 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-12-06 11:29:39 -0500 |
| commit | bbf76a78b4a43f66a6c212fe1306bfb56466a0de (patch) | |
| tree | fc6034bc2a94794eac52b9086af4f5df72399842 /drivers/acpi | |
| parent | 79f848ea36f33a20a2e2dcfe314689d012450c3c (diff) | |
| parent | 538069756ce13f9d0e0ccb7a17b6935a0bfb7cad (diff) | |
Merge tag 'v3.10.22' into v3.10-rt
This is the 3.10.22 stable release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/pci_root.c | 3 | ||||
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index e36842b9e1fa..a02a91cd1de4 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -63,6 +63,9 @@ static struct acpi_scan_handler pci_root_handler = { .ids = root_device_ids, .attach = acpi_pci_root_add, .detach = acpi_pci_root_remove, + .hotplug = { + .ignore = true, + }, }; /* Lock to protect both acpi_pci_roots lists */ diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 362f0c2aa1ea..cca761e80d89 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1790,7 +1790,7 @@ static void acpi_scan_init_hotplug(acpi_handle handle, int type) */ list_for_each_entry(hwid, &pnp.ids, list) { handler = acpi_scan_match_handler(hwid->id, NULL); - if (handler) { + if (handler && !handler->hotplug.ignore) { acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, acpi_hotplug_notify_cb, handler); break; |