diff options
| author | skrll <skrll@NetBSD.org> | 2016-12-14 15:11:29 +0000 |
|---|---|---|
| committer | skrll <skrll@NetBSD.org> | 2016-12-14 15:11:29 +0000 |
| commit | 444f4be1fcb3befcf22ebb9ec4e2c1bd31c3ac9f (patch) | |
| tree | e5f02f99efc7c9a05f9faf0bfdc85a2356e0b599 /sys/dev/usb/ucom.c | |
| parent | 70a53d299e24916b4ecdaea5d7f8f4daea215cd0 (diff) | |
Don't hold softc lock when calling ucom_read
PR/51714: uftdi (on xhci): mutex_vector_enter: locking against myself
Diffstat (limited to 'sys/dev/usb/ucom.c')
| -rw-r--r-- | sys/dev/usb/ucom.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index b7b64539404..500885dec9f 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $NetBSD: ucom.c,v 1.117 2016/12/04 10:12:35 skrll Exp $ */ +/* $NetBSD: ucom.c,v 1.118 2016/12/14 15:11:29 skrll Exp $ */ /* * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.117 2016/12/04 10:12:35 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.118 2016/12/14 15:11:29 skrll Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1608,6 +1608,7 @@ ucomreadcb(struct usbd_xfer *xfer, void *p, usbd_status status) return; } + mutex_exit(&sc->sc_lock); if (sc->sc_methods->ucom_read != NULL) { sc->sc_methods->ucom_read(sc->sc_parent, sc->sc_portno, &cp, &cc); @@ -1617,6 +1618,15 @@ ucomreadcb(struct usbd_xfer *xfer, void *p, usbd_status status) ub->ub_len = cc; + mutex_enter(&sc->sc_lock); + if (sc->sc_dying) { + if (--sc->sc_refcnt < 0) + cv_broadcast(&sc->sc_detachcv); + mutex_exit(&sc->sc_lock); + DPRINTF("... dying", 0, 0, 0, 0); + return; + } + SIMPLEQ_INSERT_TAIL(&sc->sc_ibuff_full, ub, ub_link); ucom_read_complete(sc); |
