From owner-svn-src-head@FreeBSD.ORG  Wed Nov  7 18:44:06 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1F96D7EF;
 Wed,  7 Nov 2012 18:44:06 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 045EC8FC08;
 Wed,  7 Nov 2012 18:44:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA7Ii5He083059;
 Wed, 7 Nov 2012 18:44:05 GMT (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA7Ii5e9083057;
 Wed, 7 Nov 2012 18:44:05 GMT (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201211071844.qA7Ii5e9083057@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 7 Nov 2012 18:44:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242702 - head/sys/dev/usb/serial
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Nov 2012 18:44:06 -0000

Author: hselasky
Date: Wed Nov  7 18:44:05 2012
New Revision: 242702
URL: http://svnweb.freebsd.org/changeset/base/242702

Log:
  The tty_inwakeup callback appears to be called both locked and unlocked.
  Handle the required locking automatically for now.
  
  MFC after:	1 weeks

Modified:
  head/sys/dev/usb/serial/usb_serial.c

Modified: head/sys/dev/usb/serial/usb_serial.c
==============================================================================
--- head/sys/dev/usb/serial/usb_serial.c	Wed Nov  7 17:41:17 2012	(r242701)
+++ head/sys/dev/usb/serial/usb_serial.c	Wed Nov  7 18:44:05 2012	(r242702)
@@ -788,15 +788,20 @@ ucom_inwakeup(struct tty *tp)
 {
 	struct ucom_softc *sc = tty_softc(tp);
 	uint16_t pos;
+	int locked;
 
 	if (sc == NULL)
 		return;
 
-	tty_lock(tp);
+	locked = mtx_owned(sc->sc_mtx);
+
+	if (locked == 0)
+		tty_lock(tp);
 
 	if (ttydisc_can_bypass(tp) != 0 || 
 	    (sc->sc_flag & UCOM_FLAG_HL_READY) == 0) {
-		tty_unlock(tp);
+		if (locked == 0)
+			tty_unlock(tp);
 		return;
 	}
 
@@ -821,7 +826,8 @@ ucom_inwakeup(struct tty *tp)
 	    (sc->sc_flag & UCOM_FLAG_RTS_IFLOW))
 		ucom_rts(sc, 0);
 
-	tty_unlock(tp);
+	if (locked == 0)
+		tty_unlock(tp);
 }
 
 static int