svn commit: r208438 - head/sys/dev/acpica

Alexander Motin mav at FreeBSD.org
Sun May 23 08:31:15 UTC 2010


Author: mav
Date: Sun May 23 08:31:15 2010
New Revision: 208438
URL: http://svn.freebsd.org/changeset/base/208438

Log:
  Oops, HPET ID optionally stored in _UID, not in _ADR.

Modified:
  head/sys/dev/acpica/acpi_hpet.c

Modified: head/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- head/sys/dev/acpica/acpi_hpet.c	Sun May 23 08:12:36 2010	(r208437)
+++ head/sys/dev/acpica/acpi_hpet.c	Sun May 23 08:31:15 2010	(r208438)
@@ -107,7 +107,7 @@ acpi_hpet_find(ACPI_HANDLE handle, UINT3
 {
 	char 		**ids;
 	uint32_t	id = (uint32_t)(uintptr_t)context;
-	uint32_t	adr = 0;
+	uint32_t	uid = 0;
 
 	for (ids = hpet_ids; *ids != NULL; ids++) {
 		if (acpi_MatchHid(handle, *ids))
@@ -115,9 +115,9 @@ acpi_hpet_find(ACPI_HANDLE handle, UINT3
 	}
 	if (*ids == NULL)
 		return (AE_OK);
-	if (ACPI_FAILURE(acpi_GetInteger(handle, "_ADR", &adr)))
-		adr = 0;
-	if (id == adr)
+	if (ACPI_FAILURE(acpi_GetInteger(handle, "_UID", &uid)))
+		uid = 0;
+	if (id == uid)
 		*((int *)status) = 1;
 	return (AE_OK);
 }


More information about the svn-src-all mailing list