D60797.diff
No OneTemporary
Actions

Size

605 B

Referenced Files

None

Subscribers

None

D60797.diff
View Options

	diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
	--- a/sys/dev/acpica/acpi.c
	+++ b/sys/dev/acpica/acpi.c
	@@ -740,9 +740,6 @@
	"acpi");
	sc->acpi_dev_t->si_drv1 = sc;

	- if ((error = acpi_machdep_init(dev)))
	- goto out;
	-
	/*
	* Setup our sysctl tree.
	*
	@@ -811,6 +808,9 @@
	"Force active-hi polarity for edge-triggered ISA IRQs");
	#endif

	+ if ((error = acpi_machdep_init(dev)))
	+ goto out;
	+
	/* Register ACPI again to pass the correct argument of pm_func. */
	power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, sc,
	sc->acpi_supported_stypes);