Module Name: src
Committed By: thorpej
Date: Tue Jun 19 04:10:51 UTC 2018
Modified Files:
src/sys/kern: subr_autoconf.c
Log Message:
Sigh, fix another stupid mistake in previous that squeaked by because,
again, I booted the wrong test kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/kern/subr_autoconf.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/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.259 src/sys/kern/subr_autoconf.c:1.260
--- src/sys/kern/subr_autoconf.c:1.259 Mon Jun 18 16:31:42 2018
+++ src/sys/kern/subr_autoconf.c Tue Jun 19 04:10:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.259 2018/06/18 16:31:42 thorpej Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.260 2018/06/19 04:10:51 thorpej Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.259 2018/06/18 16:31:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.260 2018/06/19 04:10:51 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -2286,12 +2286,13 @@ device_compatible_entry_matches(const st
{
const char **cpp = DEVICE_COMPAT_ENTRY_GET_STRINGS(dce);
- if (cpp == NULL)
+ if (dce == NULL || cpp == NULL)
return false;
- while (*cpp != NULL)
- if (strcmp(*cpp++, compatible) == 0)
+ for (; *cpp != NULL; cpp++) {
+ if (strcmp(*cpp, compatible) == 0)
return true;
+ }
return false;
}
