Merge back earlier acpi-hotplug material.
This commit is contained in:
commit
76540969b1
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -100,6 +100,7 @@ enum acpi_hotplug_mode {
|
|||
struct acpi_hotplug_profile {
|
||||
struct kobject kobj;
|
||||
bool enabled:1;
|
||||
bool ignore:1;
|
||||
enum acpi_hotplug_mode mode;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue