From owner-svn-src-all@FreeBSD.ORG  Sat Jun 23 13:52:45 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B0A8C106564A;
	Sat, 23 Jun 2012 13:52:45 +0000 (UTC)
	(envelope-from jhibbits@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B1868FC0C;
	Sat, 23 Jun 2012 13:52:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5NDqjch044371;
	Sat, 23 Jun 2012 13:52:45 GMT
	(envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5NDqjbp044369;
	Sat, 23 Jun 2012 13:52:45 GMT
	(envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201206231352.q5NDqjbp044369@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Sat, 23 Jun 2012 13:52:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237480 - head/sys/dev/adb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jun 2012 13:52:45 -0000

Author: jhibbits
Date: Sat Jun 23 13:52:44 2012
New Revision: 237480
URL: http://svn.freebsd.org/changeset/base/237480

Log:
  Release the ADB keyboard mutex when handling the power button
  press/release.  Found by WITNESS.
  
  Approved by:	nwhitehorn (mentor)
  MFC after:	3 days

Modified:
  head/sys/dev/adb/adb_kbd.c

Modified: head/sys/dev/adb/adb_kbd.c
==============================================================================
--- head/sys/dev/adb/adb_kbd.c	Sat Jun 23 12:40:24 2012	(r237479)
+++ head/sys/dev/adb/adb_kbd.c	Sat Jun 23 13:52:44 2012	(r237480)
@@ -426,8 +426,10 @@ adb_kbd_receive_packet(device_t dev, u_c
 		/* 0x7f is always the power button */
 		if (data[0] == 0x7f && devctl_process_running()) {
 			devctl_notify("PMU", "Button", "pressed", NULL);
+			mtx_unlock(&sc->sc_mutex);
 			return (0);
 		} else if (data[0] == 0xff) {
+			mtx_unlock(&sc->sc_mutex);
 			return (0);	/* Ignore power button release. */
 		}
 		if ((data[0] & 0x7f) == 57 && sc->buffers < 7) {