From owner-svn-src-stable@FreeBSD.ORG  Fri Jun 29 10:39:43 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2B119106566B;
	Fri, 29 Jun 2012 10:39:43 +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 158DA8FC0A;
	Fri, 29 Jun 2012 10:39:43 +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 q5TAdg7G040674;
	Fri, 29 Jun 2012 10:39:42 GMT
	(envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TAdgbA040672;
	Fri, 29 Jun 2012 10:39:42 GMT
	(envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201206291039.q5TAdgbA040672@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Fri, 29 Jun 2012 10:39:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237773 - stable/9/sys/dev/adb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jun 2012 10:39:43 -0000

Author: jhibbits
Date: Fri Jun 29 10:39:42 2012
New Revision: 237773
URL: http://svn.freebsd.org/changeset/base/237773

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

Modified:
  stable/9/sys/dev/adb/adb_kbd.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/adb/adb_kbd.c
==============================================================================
--- stable/9/sys/dev/adb/adb_kbd.c	Fri Jun 29 10:31:26 2012	(r237772)
+++ stable/9/sys/dev/adb/adb_kbd.c	Fri Jun 29 10:39:42 2012	(r237773)
@@ -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) {