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

If we panic before the vsbus is found, don't panic again.

This commit is contained in:
ragge 2000-05-26 21:05:01 +00:00
parent 2649f518ec
commit 4eea61af11
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/vax/vsa/vsbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vsbus.c,v 1.24 2000/04/23 16:38:54 matt Exp $ */ /* $NetBSD: vsbus.c,v 1.25 2000/05/26 21:05:01 ragge Exp $ */
/* /*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden. * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved. * All rights reserved.
@ -248,9 +248,13 @@ unsigned char
vsbus_setmask(mask) vsbus_setmask(mask)
unsigned char mask; unsigned char mask;
{ {
struct vsbus_softc *sc = vsbus_cd.cd_devs[0]; struct vsbus_softc *sc;
unsigned char ch; unsigned char ch;
if (vsbus_cd.cd_ndevs == 0)
return 0;
sc = vsbus_cd.cd_devs[0];
ch = *sc->sc_intmsk; ch = *sc->sc_intmsk;
*sc->sc_intmsk = mask; *sc->sc_intmsk = mask;
return ch; return ch;
@ -263,7 +267,11 @@ void
vsbus_clrintr(mask) vsbus_clrintr(mask)
unsigned char mask; unsigned char mask;
{ {
struct vsbus_softc *sc = vsbus_cd.cd_devs[0]; struct vsbus_softc *sc;
if (vsbus_cd.cd_ndevs == 0)
return;
sc = vsbus_cd.cd_devs[0];
*sc->sc_intclr = mask; *sc->sc_intclr = mask;
} }