diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2006-05-17 19:54:11 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2006-05-17 19:54:11 +0000 |
| commit | a9072accd225f1bc2386d5ee39893d0976b0f085 (patch) | |
| tree | 3e254d829555dc028c5ce9dee657ef876dd8f66a /sys/dev | |
| parent | a403fa8a38212fca0a60d2347454789f49663629 (diff) | |
sync handling of fatal firmware errors w/ wpi(4)
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_ipw.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwi.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index 43e048c5f65..9e44d862f22 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ipw.c,v 1.56 2006/03/25 22:41:45 djm Exp $ */ +/* $OpenBSD: if_ipw.c,v 1.57 2006/05/17 19:54:10 damien Exp $ */ /*- * Copyright (c) 2004-2006 @@ -1070,8 +1070,9 @@ ipw_intr(void *arg) DPRINTFN(8, ("INTR!0x%08x\n", r)); if (r & (IPW_INTR_FATAL_ERROR | IPW_INTR_PARITY_ERROR)) { - printf("%s: fatal error\n", sc->sc_dev.dv_xname); + printf("%s: fatal firmware error\n", sc->sc_dev.dv_xname); ipw_stop(&sc->sc_ic.ic_if, 1); + return 1; } if (r & IPW_INTR_FW_INIT_DONE) { diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 55c74b3a457..38948485a9d 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.67 2006/05/01 08:39:17 damien Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.68 2006/05/17 19:54:10 damien Exp $ */ /*- * Copyright (c) 2004-2006 @@ -1195,9 +1195,9 @@ iwi_intr(void *arg) CSR_WRITE_4(sc, IWI_CSR_INTR, r); if (r & (IWI_INTR_FATAL_ERROR | IWI_INTR_PARITY_ERROR)) { - printf("%s: fatal error\n", sc->sc_dev.dv_xname); + printf("%s: fatal firmware error\n", sc->sc_dev.dv_xname); iwi_stop(&sc->sc_ic.ic_if, 1); - r = 0; /* don't process more interrupts */ + return 1; } if (r & IWI_INTR_FW_INITED) { |