diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-06-27 03:49:45 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-06-27 03:49:45 +0000 |
| commit | 554b34e8a0a60d1b8eced8243cde1bd66bf85545 (patch) | |
| tree | cb505a863a6e44f9b9f19cf6d01867f36328a0be | |
| parent | 530b264f1d69a912f739c52eef99f386ac91b5cb (diff) | |
avoid multiple detach problems; ich@florian-stoehr.de
| -rw-r--r-- | sys/dev/usb/if_zyd.c | 32 | ||||
| -rw-r--r-- | sys/dev/usb/if_zydreg.h | 3 |
2 files changed, 19 insertions, 16 deletions
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index dd328b5309a..fd05588a9eb 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zyd.c,v 1.2 2006/06/21 18:49:20 deraadt Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.3 2006/06/27 03:49:44 deraadt Exp $ */ /* * Copyright (c) 2006 by Florian Stoehr <ich@florian-stoehr.de> @@ -883,23 +883,21 @@ zyd_openpipes(struct zyd_softc *sc) void zyd_closepipes(struct zyd_softc *sc) { - usbd_abort_pipe(sc->zyd_ep[ZYD_ENDPT_IIN]); - usbd_close_pipe(sc->zyd_ep[ZYD_ENDPT_IIN]); - - usbd_abort_pipe(sc->zyd_ep[ZYD_ENDPT_IOUT]); - usbd_close_pipe(sc->zyd_ep[ZYD_ENDPT_IOUT]); - - usbd_abort_pipe(sc->zyd_ep[ZYD_ENDPT_BIN]); - usbd_close_pipe(sc->zyd_ep[ZYD_ENDPT_BIN]); + int i; - usbd_abort_pipe(sc->zyd_ep[ZYD_ENDPT_BOUT]); - usbd_close_pipe(sc->zyd_ep[ZYD_ENDPT_BOUT]); + for (i = 0; i < ZYD_ENDPT_CNT; i++) + if (sc->zyd_ep[i]) { + usbd_abort_pipe(sc->zyd_ep[i]); + usbd_close_pipe(sc->zyd_ep[i]); + } ndflush(&sc->q_reply, sc->q_reply.c_cc); clfree(&sc->q_reply); - free(sc->ibuf, M_USBDEV); - sc->ibuf = NULL; + if (sc->ibuf) { + free(sc->ibuf, M_USBDEV); + sc->ibuf = NULL; + } } /* @@ -1516,6 +1514,7 @@ USB_ATTACH(zyd) /* Complete the attach process (hardware init) */ if (zyd_complete_attach(sc) != 0) USB_ATTACH_ERROR_RETURN; + sc->zyd_attached = 1; USB_ATTACH_SUCCESS_RETURN; } @@ -2640,8 +2639,11 @@ USB_DETACH(zyd) zyd_free_rx(sc); zyd_free_tx(sc); - ieee80211_ifdetach(ifp); - if_detach(ifp); + if (sc->zyd_attached) { + ieee80211_ifdetach(ifp); + if_detach(ifp); + } + sc->zyd_attached = 0; splx(s); diff --git a/sys/dev/usb/if_zydreg.h b/sys/dev/usb/if_zydreg.h index 54ae9704947..15235d1e27a 100644 --- a/sys/dev/usb/if_zydreg.h +++ b/sys/dev/usb/if_zydreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zydreg.h,v 1.2 2006/06/21 18:52:02 deraadt Exp $ */ +/* $OpenBSD: if_zydreg.h,v 1.3 2006/06/27 03:49:44 deraadt Exp $ */ /* * Copyright (c) 2006 by Florian Stoehr <ich@florian-stoehr.de> @@ -1099,6 +1099,7 @@ struct zyd_softc { int zyd_unit; int zyd_if_flags; + int zyd_attached; struct timeval zyd_rx_notice; |