d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add lock asserts instead of "auto-locking".

Browse Source 
MFC after:	1 weeks
Suggested by:	ed @
This commit is contained in:
Hans Petter Selasky 2012-11-07 18:59:42 +00:00
parent 3b8e984374
commit 9a630052d4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=242703
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/usb/serial/usb_serial.c
View File

@ -788,20 +788,16 @@ ucom_inwakeup(struct tty *tp)
{
struct ucom_softc *sc = tty_softc(tp);
uint16_t pos;
int locked;
if (sc == NULL)
return;
locked = mtx_owned(sc->sc_mtx);
UCOM_MTX_ASSERT(sc, MA_OWNED);
if (locked == 0)
tty_lock(tp);
DPRINTF("tp=%p\n", tp);
if (ttydisc_can_bypass(tp) != 0 ||
(sc->sc_flag & UCOM_FLAG_HL_READY) == 0) {
if (locked == 0)
tty_unlock(tp);
return;
}
@ -825,9 +821,6 @@ ucom_inwakeup(struct tty *tp)
if ((sc->sc_jitterbuf_in == pos) &&
(sc->sc_flag & UCOM_FLAG_RTS_IFLOW))
ucom_rts(sc, 0);
if (locked == 0)
tty_unlock(tp);
}
static int