Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Invoke zs_lock_init() _after_ copying console state to avoid a later

Browse Source 
lock-related panic.
This commit is contained in:
scw 2009-04-11 11:01:47 +00:00
parent 94ec558cb9
commit 9678a68913
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/mvme68k/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.41 2008/06/13 12:26:02 cegger Exp $ */ /* $NetBSD: zs.c,v 1.42 2009/04/11 11:01:47 scw Exp $ */
/*- /*-
* Copyright (c) 1996 The NetBSD Foundation, Inc. * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.41 2008/06/13 12:26:02 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.42 2009/04/11 11:01:47 scw Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -143,7 +143,6 @@ zs_config(struct zsc_softc *zsc, struct zsdevice *zs, int vector, int pclk)
zsc_args.hwflags = zs_hwflags[zsc_unit][channel]; zsc_args.hwflags = zs_hwflags[zsc_unit][channel];
cs = &zsc->zsc_cs_store[channel]; cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs; zsc->zsc_cs[channel] = cs;
zs_lock_init(cs);
/* /*
* If we're the console, copy the channel state, and * If we're the console, copy the channel state, and
@ -161,6 +160,7 @@ zs_config(struct zsc_softc *zsc, struct zsdevice *zs, int vector, int pclk)
cs->cs_defspeed = zs_defspeed[zsc_unit][channel]; cs->cs_defspeed = zs_defspeed[zsc_unit][channel];
} }
zs_lock_init(cs);
cs->cs_brg_clk = pclk / 16; cs->cs_brg_clk = pclk / 16;
cs->cs_creg[2] = cs->cs_preg[2] = vector; cs->cs_creg[2] = cs->cs_preg[2] = vector;
zs_set_speed(cs, cs->cs_defspeed); zs_set_speed(cs, cs->cs_defspeed);