diff options
Diffstat (limited to 'sys/dev/usb/serial/uslcom.c')
| -rw-r--r-- | sys/dev/usb/serial/uslcom.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/usb/serial/uslcom.c b/sys/dev/usb/serial/uslcom.c index 3145151..af7039c 100644 --- a/sys/dev/usb/serial/uslcom.c +++ b/sys/dev/usb/serial/uslcom.c @@ -96,6 +96,7 @@ struct uslcom_softc { struct usb2_xfer *sc_xfer[USLCOM_N_TRANSFER]; struct usb2_device *sc_udev; + struct mtx sc_mtx; uint8_t sc_msr; uint8_t sc_lsr; @@ -227,23 +228,26 @@ uslcom_attach(device_t dev) DPRINTFN(11, "\n"); device_set_usb2_desc(dev); + mtx_init(&sc->sc_mtx, "uslcom", NULL, MTX_DEF); sc->sc_udev = uaa->device; error = usb2_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, sc->sc_xfer, uslcom_config, - USLCOM_N_TRANSFER, sc, &Giant); + USLCOM_N_TRANSFER, sc, &sc->sc_mtx); if (error) { DPRINTF("one or more missing USB endpoints, " "error=%s\n", usb2_errstr(error)); goto detach; } /* clear stall at first run */ + mtx_lock(&sc->sc_mtx); usb2_transfer_set_stall(sc->sc_xfer[USLCOM_BULK_DT_WR]); usb2_transfer_set_stall(sc->sc_xfer[USLCOM_BULK_DT_RD]); + mtx_unlock(&sc->sc_mtx); error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, - &uslcom_callback, &Giant); + &uslcom_callback, &sc->sc_mtx); if (error) { goto detach; } @@ -262,8 +266,8 @@ uslcom_detach(device_t dev) DPRINTF("sc=%p\n", sc); usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); - usb2_transfer_unsetup(sc->sc_xfer, USLCOM_N_TRANSFER); + mtx_destroy(&sc->sc_mtx); return (0); } |
