Module Name: src
Committed By: bouyer
Date: Sun Oct 25 20:46:46 UTC 2015
Modified Files:
src/sys/arch/evbarm/awin: awin_sysconfig.c
Log Message:
Return an error instead of KASSERT() we don't get the expected type for
a key.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/awin/awin_sysconfig.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/arch/evbarm/awin/awin_sysconfig.c
diff -u src/sys/arch/evbarm/awin/awin_sysconfig.c:1.1 src/sys/arch/evbarm/awin/awin_sysconfig.c:1.2
--- src/sys/arch/evbarm/awin/awin_sysconfig.c:1.1 Wed Oct 22 00:24:52 2014
+++ src/sys/arch/evbarm/awin/awin_sysconfig.c Sun Oct 25 20:46:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_sysconfig.c,v 1.1 2014/10/22 00:24:52 jmcneill Exp $ */
+/* $NetBSD: awin_sysconfig.c,v 1.2 2015/10/25 20:46:46 bouyer Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_allwinner.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_sysconfig.c,v 1.1 2014/10/22 00:24:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_sysconfig.c,v 1.2 2015/10/25 20:46:46 bouyer Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -154,7 +154,8 @@ awin_sysconfig_get_int(const char *key,
if (awin_sysconfig_parse(key, subkey, &value) == false)
return -1;
- KASSERT(value.type == AWIN_SYSCONFIG_TYPE_SINGLE_WORD);
+ if (value.type != AWIN_SYSCONFIG_TYPE_SINGLE_WORD)
+ return -1;
memcpy(&ret, &awin_sysconfig[value.offset << 2], sizeof(ret));
@@ -169,7 +170,8 @@ awin_sysconfig_get_string(const char *ke
if (awin_sysconfig_parse(key, subkey, &value) == false)
return NULL;
- KASSERT(value.type == AWIN_SYSCONFIG_TYPE_STRING);
+ if (value.type != AWIN_SYSCONFIG_TYPE_STRING)
+ return NULL;
return &awin_sysconfig[value.offset << 2];
}
