D56483.diff
No OneTemporary
Actions

Size

851 B

Referenced Files

None

Subscribers

None

D56483.diff
View Options

	diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c
	--- a/sys/dev/acpica/acpi_spmc.c
	+++ b/sys/dev/acpica/acpi_spmc.c
	@@ -200,12 +200,13 @@
	}

	handle = acpi_get_handle(dev);
	- if (handle == NULL)
	- return (ENXIO);
	+ /* ACPI_ID_PROBE() above cannot succeed without a handle. */
	+ MPASS(handle != NULL);

	sc = device_get_softc(dev);
	+ sc->dev = dev;

	- /* Check which sets of DSM's are supported. */
	+ /* Check which sets of DSMs are supported. */
	sc->dsm_sets = 0;

	acpi_spmc_check_dsm_set(sc, handle, &intel_dsm_set);
	@@ -286,7 +287,7 @@

	if ((dsms_supported & ~max_dsms) != 0)
	device_printf(sc->dev, "DSM set %s supports more DSMs than "
	- "expected (%#" PRIx64 " vs %#" PRIx64 ").", dsm_set->name,
	+ "expected (%#" PRIx64 " vs %#" PRIx64 ").\n", dsm_set->name,
	dsms_supported, max_dsms);
	}