Module Name: src
Committed By: snj
Date: Tue Jun 9 17:51:16 UTC 2009
Modified Files:
src/sys/arch/sparc/dev [netbsd-5-0]: zs.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #800):
sys/arch/sparc/dev/zs.c: revision 1.116
Properly initialize child attach args to zero - we could end up with
various devices having different ideas about being console otherwise.
To generate a diff of this commit:
cvs rdiff -u -r1.111.6.1 -r1.111.6.1.2.1 src/sys/arch/sparc/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/sparc/dev/zs.c
diff -u src/sys/arch/sparc/dev/zs.c:1.111.6.1 src/sys/arch/sparc/dev/zs.c:1.111.6.1.2.1
--- src/sys/arch/sparc/dev/zs.c:1.111.6.1 Tue Nov 18 02:34:06 2008
+++ src/sys/arch/sparc/dev/zs.c Tue Jun 9 17:51:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.111.6.1 2008/11/18 02:34:06 snj Exp $ */
+/* $NetBSD: zs.c,v 1.111.6.1.2.1 2009/06/09 17:51:15 snj Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.111.6.1 2008/11/18 02:34:06 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.111.6.1.2.1 2009/06/09 17:51:15 snj Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -401,6 +401,7 @@
int ch0_is_cons = 0;
#endif
+ memset(&zsc_args, 0, sizeof zsc_args);
if (zsd == NULL) {
aprint_error(": configuration incomplete\n");
return;
@@ -424,6 +425,7 @@
int hwflags;
zsc_args.channel = channel;
+ zsc_args.hwflags = 0;
cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs;
