diff options
| author | hselasky <hselasky@FreeBSD.org> | 2012-11-21 22:04:40 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2012-11-21 22:04:40 +0000 |
| commit | 61b7088a9c0487903f911850b1eb3c5f9d15dc25 (patch) | |
| tree | c44f9f18b616bbf8b825d7666a4c4cfc33818004 | |
| parent | 133206e35ac774847c2dafb92f63e78e2ad8e96e (diff) | |
| download | FreeBSD-src-61b7088a9c0487903f911850b1eb3c5f9d15dc25.zip FreeBSD-src-61b7088a9c0487903f911850b1eb3c5f9d15dc25.tar.gz | |
Fix uplcom clear stall logic for PL2303HX.
Submitted by: Mark Johnston
MFC after: 1 week
| -rw-r--r-- | sys/dev/usb/serial/uplcom.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c index 4549bad..6516f89 100644 --- a/sys/dev/usb/serial/uplcom.c +++ b/sys/dev/usb/serial/uplcom.c @@ -432,11 +432,21 @@ uplcom_attach(device_t dev) usbd_errstr(error)); goto detach; } - /* clear stall at first run */ - mtx_lock(&sc->sc_mtx); - usbd_xfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_WR]); - usbd_xfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_RD]); - mtx_unlock(&sc->sc_mtx); + + if (sc->sc_chiptype != TYPE_PL2303HX) { + /* HX variants seem to lock up after a clear stall request. */ + mtx_lock(&sc->sc_mtx); + usbd_xfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[UPLCOM_BULK_DT_RD]); + mtx_unlock(&sc->sc_mtx); + } else { + if (uplcom_pl2303_do(sc->sc_udev, UT_WRITE_VENDOR_DEVICE, + UPLCOM_SET_REQUEST, 8, 0, 0) || + uplcom_pl2303_do(sc->sc_udev, UT_WRITE_VENDOR_DEVICE, + UPLCOM_SET_REQUEST, 9, 0, 0)) { + goto detach; + } + } error = ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &uplcom_callback, &sc->sc_mtx); @@ -555,9 +565,6 @@ uplcom_pl2303_init(struct usb_device *udev, uint8_t chiptype) if (err) return (EIO); - if (uplcom_pl2303_do(udev, UT_WRITE_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 8, 0, 0) - || uplcom_pl2303_do(udev, UT_WRITE_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 9, 0, 0)) - return (EIO); return (0); } |
