diff options
Diffstat (limited to 'sys/dev/usb/serial/uvscom.c')
| -rw-r--r-- | sys/dev/usb/serial/uvscom.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/usb/serial/uvscom.c b/sys/dev/usb/serial/uvscom.c index bb91c40..b4aa370 100644 --- a/sys/dev/usb/serial/uvscom.c +++ b/sys/dev/usb/serial/uvscom.c @@ -163,7 +163,7 @@ struct uvscom_softc { static device_probe_t uvscom_probe; static device_attach_t uvscom_attach; static device_detach_t uvscom_detach; -static device_free_softc_t uvscom_free_softc; +static void uvscom_free_softc(struct uvscom_softc *); static usb_callback_t uvscom_write_callback; static usb_callback_t uvscom_read_callback; @@ -253,7 +253,6 @@ static device_method_t uvscom_methods[] = { DEVMETHOD(device_probe, uvscom_probe), DEVMETHOD(device_attach, uvscom_attach), DEVMETHOD(device_detach, uvscom_detach), - DEVMETHOD(device_free_softc, uvscom_free_softc), DEVMETHOD_END }; @@ -354,27 +353,28 @@ uvscom_detach(device_t dev) ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom); usbd_transfer_unsetup(sc->sc_xfer, UVSCOM_N_TRANSFER); + device_claim_softc(dev); + + uvscom_free_softc(sc); + return (0); } UCOM_UNLOAD_DRAIN(uvscom); static void -uvscom_free_softc(device_t dev, void *arg) +uvscom_free_softc(struct uvscom_softc *sc) { - struct uvscom_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 uvscom_free(struct ucom_softc *ucom) { - uvscom_free_softc(NULL, ucom->sc_parent); + uvscom_free_softc(ucom->sc_parent); } static void |
