Author: avg
Date: Wed May 22 08:30:03 2019
New Revision: 348108
URL: https://svnweb.freebsd.org/changeset/base/348108
Log:
acpi_hpet: restore support for timers defined only in HPET table
This fixes a regress introduced in r339754.
After that change the code required that there is a HPET device
in the ACPI namespace.
The problem has been noticed on an PC Engines apu2 system.
While here, fix a small formatting issue.
Modified:
head/sys/dev/acpica/acpi_hpet.c
Modified: head/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- head/sys/dev/acpica/acpi_hpet.c Wed May 22 07:41:58 2019
(r348107)
+++ head/sys/dev/acpica/acpi_hpet.c Wed May 22 08:30:03 2019
(r348108)
@@ -455,9 +455,12 @@ hpet_probe(device_t dev)
ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
if (acpi_disabled("hpet") || acpi_hpet_disabled)
return (ENXIO);
- rv = ACPI_ID_PROBE(device_get_parent(dev), dev, hpet_ids, NULL);
+ if (acpi_get_handle(dev) != NULL)
+ rv = ACPI_ID_PROBE(device_get_parent(dev), dev, hpet_ids, NULL);
+ else
+ rv = 0;
if (rv <= 0)
- device_set_desc(dev, "High Precision Event Timer");
+ device_set_desc(dev, "High Precision Event Timer");
return (rv);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
