Module Name: src
Committed By: christos
Date: Wed Aug 19 00:19:37 UTC 2009
Modified Files:
src/sys/dev/acpi: sony_acpi.c
Log Message:
the new acpi code seems to return NULL for the hardwareId string.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/sony_acpi.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/sony_acpi.c
diff -u src/sys/dev/acpi/sony_acpi.c:1.9 src/sys/dev/acpi/sony_acpi.c:1.10
--- src/sys/dev/acpi/sony_acpi.c:1.9 Tue Aug 18 12:41:02 2009
+++ src/sys/dev/acpi/sony_acpi.c Tue Aug 18 20:19:37 2009
@@ -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);
