acpi.diff
jkim (Jung-uk Kim)
Actions

Authored By

	jkim
	Feb 21 2018, 10:07 PM

Size

996 B

Referenced Files

None

Subscribers

None

acpi.diff
View Options

	Index: sys/amd64/acpica/acpi_machdep.c
	===================================================================
	--- sys/amd64/acpica/acpi_machdep.c (revision 329748)
	+++ sys/amd64/acpica/acpi_machdep.c (working copy)
	@@ -63,6 +63,7 @@ acpi_machdep_init(device_t dev)
	sc = device_get_softc(dev);

	acpi_apm_init(sc);
	+ acpi_install_wakeup_handler(sc);

	if (intr_model != ACPI_INTR_PIC)
	acpi_SetIntrModel(intr_model);
	@@ -349,20 +350,13 @@ nexus_acpi_probe(device_t dev)
	static int
	nexus_acpi_attach(device_t dev)
	{
	- device_t acpi_dev;
	- int error;

	nexus_init_resources();
	bus_generic_probe(dev);
	- acpi_dev = BUS_ADD_CHILD(dev, 10, "acpi", 0);
	- if (acpi_dev == NULL)
	+ if (BUS_ADD_CHILD(dev, 10, "acpi", 0) == NULL)
	panic("failed to add acpi0 device");

	- error = bus_generic_attach(dev);
	- if (error == 0)
	- acpi_install_wakeup_handler(device_get_softc(acpi_dev));
	-
	- return (error);
	+ return (bus_generic_attach(dev));
	}

	static device_method_t nexus_acpi_methods[] = {