Module Name: src
Committed By: christos
Date: Thu Jul 19 18:03:32 UTC 2012
Modified Files:
src/sys/dev/acpi: acpi_tz.c
Log Message:
Treat empty package returned from _AL<n> method the same as non-existent.
>From jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/acpi/acpi_tz.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.85 src/sys/dev/acpi/acpi_tz.c:1.86
--- src/sys/dev/acpi/acpi_tz.c:1.85 Thu Feb 2 14:43:02 2012
+++ src/sys/dev/acpi/acpi_tz.c Thu Jul 19 14:03:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.85 2012/02/02 19:43:02 tls Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.86 2012/07/19 18:03:32 christos Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.85 2012/02/02 19:43:02 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.86 2012/07/19 18:03:32 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -536,7 +536,7 @@ acpitz_get_zone(void *opaque, int verbos
obj = sc->sc_zone.al[i].Pointer;
- if (obj->Type != ACPI_TYPE_PACKAGE) {
+ if (obj->Type != ACPI_TYPE_PACKAGE || obj->Package.Count == 0) {
sc->sc_zone.al[i].Pointer = NULL;
ACPI_FREE(obj);
continue;
