summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hp.com>2013-11-20 14:25:34 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-20 14:25:34 +0100
commitca499fc87ed945094d952da0eb7eea7dbeb1feec (patch)
tree2bc0d81c4c782077abeef722a82ff081484c2f90 /drivers/acpi/pci_root.c
parent296e5809ee567e41d55da41a882abef9d8071e5e (diff)
downloadop-kernel-dev-ca499fc87ed945094d952da0eb7eea7dbeb1feec.zip
op-kernel-dev-ca499fc87ed945094d952da0eb7eea7dbeb1feec.tar.gz
ACPI / hotplug: Fix conflicted PCI bridge notify handlers
The PCI host bridge scan handler installs its own notify handler, handle_hotplug_event_root(), by itself. Nevertheless, the ACPI hotplug framework also installs the common notify handler, acpi_hotplug_notify_cb(), for PCI root bridges. This causes acpi_hotplug_notify_cb() to call _OST method with unsupported error as hotplug.enabled is not set. To address this issue, introduce hotplug.ignore flag, which indicates that the scan handler installs its own notify handler by itself. The ACPI hotplug framework does not install the common notify handler when this flag is set. Signed-off-by: Toshi Kani <toshi.kani@hp.com> [rjw: Changed the name of the new flag] Cc: 3.9+ <stable@vger.kernel.org> # 3.9+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r--drivers/acpi/pci_root.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index b5cb729..a84ea1b 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -65,6 +65,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,
+ },
};
static DEFINE_MUTEX(osc_lock);
OpenPOWER on IntegriCloud