diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-22 21:48:00 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-22 21:48:00 +0100 |
| commit | 76540969b1cf26349eb8867b57657b03c89025e5 (patch) | |
| tree | dba8e982ad8b234413cba24aed0108d561714191 /drivers/acpi/scan.c | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
| parent | ca499fc87ed945094d952da0eb7eea7dbeb1feec (diff) | |
| download | linux-76540969b1cf26349eb8867b57657b03c89025e5.tar.gz linux-76540969b1cf26349eb8867b57657b03c89025e5.tar.bz2 linux-76540969b1cf26349eb8867b57657b03c89025e5.zip | |
Merge back earlier acpi-hotplug material.
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 15daa21fcd05..fd39459926b1 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1772,7 +1772,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; |