Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76540969 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back earlier acpi-hotplug material.

parents 6ce4eac1 ca499fc8

drivers/acpi/pci_root.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

drivers/acpi/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/acpi/acpi_bus.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

};