diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-07-21 16:08:22 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-07-21 16:08:22 +0000 |
| commit | b7e718c998a175fbefa2656dc922e97a91527f80 (patch) | |
| tree | 2225182563901350fa8d409b2039e905d3f1c825 /sys/dev | |
| parent | e3ba022601cfc273449ee5e69cccea7cc2047d88 (diff) | |
rollback r1.48 since it caused several panics here; brad@ ok.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_sis.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 15bc95148ed..bd52a95cd4d 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.48 2005/07/02 23:10:11 brad Exp $ */ +/* $OpenBSD: if_sis.c,v 1.49 2005/07/21 16:08:21 fgsch Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -2036,9 +2036,6 @@ void sis_stop(sc) ifp->if_timer = 0; timeout_del(&sc->sis_timeout); - - ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); - CSR_WRITE_4(sc, SIS_IER, 0); CSR_WRITE_4(sc, SIS_IMR, 0); CSR_READ_4(sc, SIS_ISR); /* clear any interrupts already pending */ @@ -2087,6 +2084,7 @@ void sis_stop(sc) sizeof(struct sis_desc) - sizeof(bus_dmamap_t)); } + ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); sc->sis_stopped = 1; return; |