[src/trunk]: src/sys/dev/acpi the new acpi code seems to return NULL for the ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d66f9cc4b10b
branches:  trunk
changeset: 746734:d66f9cc4b10b
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Aug 19 00:19:37 2009 +0000

description:
the new acpi code seems to return NULL for the hardwareId string.

diffstat:

 sys/dev/acpi/sony_acpi.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 8d4da4c3fcf6 -r d66f9cc4b10b sys/dev/acpi/sony_acpi.c
--- a/sys/dev/acpi/sony_acpi.c  Tue Aug 18 23:46:05 2009 +0000
+++ b/sys/dev/acpi/sony_acpi.c  Wed Aug 19 00:19:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sony_acpi.c,v 1.9 2009/08/18 16:41:02 jmcneill Exp $   */
+/*     $NetBSD: sony_acpi.c,v 1.10 2009/08/19 00:19:37 christos Exp $  */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.9 2009/08/18 16:41:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.10 2009/08/19 00:19:37 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -454,7 +454,8 @@
        if (ACPI_FAILURE(rv) || devinfo == NULL)
                return AE_OK;   /* we don't want to stop searching */
 
-       if (strncmp(devinfo->HardwareId.String, "SNY6001", 7) == 0)
+       if (devinfo->HardwareId.String &&
+           strncmp(devinfo->HardwareId.String, "SNY6001", 7) == 0)
                sc->sc_has_pic = true;
 
        AcpiOsFree(devinfo);