From owner-svn-src-all@FreeBSD.ORG  Sun May 23 08:31:15 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A81A1065673;
	Sun, 23 May 2010 08:31:15 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 49C6D8FC16;
	Sun, 23 May 2010 08:31:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4N8VFo7020572;
	Sun, 23 May 2010 08:31:15 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4N8VFoJ020570;
	Sun, 23 May 2010 08:31:15 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201005230831.o4N8VFoJ020570@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 23 May 2010 08:31:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208438 - head/sys/dev/acpica
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 May 2010 08:31:15 -0000

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);
 }