diff options
Diffstat (limited to 'sys/dev/usb/serial/umodem.c')
| -rw-r--r-- | sys/dev/usb/serial/umodem.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c index 72e60a9..d0dc364 100644 --- a/sys/dev/usb/serial/umodem.c +++ b/sys/dev/usb/serial/umodem.c @@ -178,7 +178,7 @@ struct umodem_softc { static device_probe_t umodem_probe; static device_attach_t umodem_attach; static device_detach_t umodem_detach; -static device_free_softc_t umodem_free_softc; +static void umodem_free_softc(struct umodem_softc *); static usb_callback_t umodem_intr_callback; static usb_callback_t umodem_write_callback; @@ -259,7 +259,6 @@ static device_method_t umodem_methods[] = { DEVMETHOD(device_probe, umodem_probe), DEVMETHOD(device_attach, umodem_attach), DEVMETHOD(device_detach, umodem_detach), - DEVMETHOD(device_free_softc, umodem_free_softc), DEVMETHOD_END }; @@ -881,27 +880,28 @@ umodem_detach(device_t dev) ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom); usbd_transfer_unsetup(sc->sc_xfer, UMODEM_N_TRANSFER); + device_claim_softc(dev); + + umodem_free_softc(sc); + return (0); } UCOM_UNLOAD_DRAIN(umodem); static void -umodem_free_softc(device_t dev, void *arg) +umodem_free_softc(struct umodem_softc *sc) { - struct umodem_softc *sc = arg; - if (ucom_unref(&sc->sc_super_ucom)) { - if (mtx_initialized(&sc->sc_mtx)) - mtx_destroy(&sc->sc_mtx); - device_free_softc(dev, sc); + mtx_destroy(&sc->sc_mtx); + device_free_softc(sc); } } static void umodem_free(struct ucom_softc *ucom) { - umodem_free_softc(NULL, ucom->sc_parent); + umodem_free_softc(ucom->sc_parent); } static void |
