Module Name: src
Committed By: isaki
Date: Fri Aug 5 05:32:02 UTC 2016
Modified Files:
src/sys/arch/x68k/dev: zs.c
Log Message:
Revert a part of previous commit.
If addr is not specified as "zsc0 at intio0" in kernel config
(though it's not right of course), it will cause a panic.
intio_map_allocate_region() should be called after address check.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x68k/dev/zs.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/x68k/dev/zs.c
diff -u src/sys/arch/x68k/dev/zs.c:1.43 src/sys/arch/x68k/dev/zs.c:1.44
--- src/sys/arch/x68k/dev/zs.c:1.43 Tue May 31 03:22:30 2016
+++ src/sys/arch/x68k/dev/zs.c Fri Aug 5 05:32:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.43 2016/05/31 03:22:30 dholland Exp $ */
+/* $NetBSD: zs.c,v 1.44 2016/08/05 05:32:02 isaki Exp $ */
/*-
* Copyright (c) 1998 Minoura Makoto
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.43 2016/05/31 03:22:30 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.44 2016/08/05 05:32:02 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,10 +148,6 @@ zs_match(device_t parent, cfdata_t cf, v
if (strcmp(ia->ia_name, "zsc") != 0)
return 0;
- ia->ia_size = 8;
- if (intio_map_allocate_region(parent, ia, INTIO_MAP_TESTONLY))
- return 0;
-
for (i = 0; i < ZS_MAXDEV; i++)
if (zsaddr == (void *)zs_physaddr[i]) /* XXX */
break;
@@ -160,6 +156,10 @@ zs_match(device_t parent, cfdata_t cf, v
return 0;
}
+ ia->ia_size = 8;
+ if (intio_map_allocate_region(parent, ia, INTIO_MAP_TESTONLY))
+ return 0;
+
if (badaddr((void *)IIOV(zsaddr)))
return 0;
