diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2008-10-28 11:53:19 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2008-10-28 11:53:19 +0000 |
| commit | f36a1fab443b63d3a1975f7024964e182dad3139 (patch) | |
| tree | 27621122bd8556de74ce08e7e73a703c74d2d8d9 /sys/dev/ic | |
| parent | 4c73ef40af1202bdbfb1dded9b12eb594a945e2c (diff) | |
Shut splassert up
Fix an undo error in previous commit
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ami.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index 1de012723c3..712e007e50f 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.189 2008/10/28 11:49:28 marco Exp $ */ +/* $OpenBSD: ami.c,v 1.190 2008/10/28 11:53:18 marco Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -188,7 +188,7 @@ ami_remove_runq(struct ami_ccb *ccb) TAILQ_REMOVE(&ccb->ccb_sc->sc_ccb_runq, ccb, ccb_link); if (TAILQ_EMPTY(&ccb->ccb_sc->sc_ccb_runq)) { ccb->ccb_sc->sc_drained = 1; - if (sc->sc_drainio) + if (ccb->ccb_sc->sc_drainio) wakeup(ccb->ccb_sc); } } @@ -328,7 +328,7 @@ ami_alloc_ccbs(struct ami_softc *sc, int nccbs) { struct ami_ccb *ccb; struct ami_ccbmem *ccbmem, *mem; - int i, error; + int i, s, error; sc->sc_ccbs = malloc(sizeof(struct ami_ccb) * nccbs, M_DEVBUF, M_NOWAIT); @@ -378,8 +378,11 @@ ami_alloc_ccbs(struct ami_softc *sc, int nccbs) if (i == nccbs - 1) { ccb->ccb_cmd.acc_id = 0xfe; sc->sc_mgmtccb = ccb; - } else + } else { + s = splbio(); ami_put_ccb(ccb); + splx(s); + } } return (0); |