diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-17 15:52:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-17 15:52:17 +0000 |
| commit | 81e53d0470878165a300d75ac06a5bc5eee543a2 (patch) | |
| tree | 5fdaacfb350c5a290109f98ab29e9858f1f11469 /drivers/acpi/scan.c | |
| parent | 15e0964dc2a097de3cf518badf2237b6b6adf7fe (diff) | |
| parent | fcb4ed749c776a2ae89ca40343cbccb6f8981e60 (diff) | |
Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw
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 15daa21fcd0..fd39459926b 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; |