From owner-p4-projects@FreeBSD.ORG  Mon Aug  3 07:12:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E0D51065675; Mon,  3 Aug 2009 07:12:46 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E46D1065673
	for <perforce@FreeBSD.org>; Mon,  3 Aug 2009 07:12:46 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2BF918FC12
	for <perforce@FreeBSD.org>; Mon,  3 Aug 2009 07:12:46 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n737CkQI070831
	for <perforce@FreeBSD.org>; Mon, 3 Aug 2009 07:12:46 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n737CkSh070829
	for perforce@freebsd.org; Mon, 3 Aug 2009 07:12:46 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 3 Aug 2009 07:12:46 GMT
Message-Id: <200908030712.n737CkSh070829@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 166958 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Aug 2009 07:12:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=166958

Change 166958 by hselasky@hselasky_laptop001 on 2009/08/03 07:12:40

	
	IFC

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#26 integrate

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#26 (text+ko) ====

@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/input/ukbd.c,v 1.15 2009/07/30 00:14:34 alfred Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/input/ukbd.c,v 1.16 2009/08/02 14:28:40 attilio Exp $");
 
 
 /*-
@@ -760,7 +760,7 @@
 	uint16_t n;
 	uint16_t hid_len;
 
-	mtx_assert(&Giant, MA_OWNED);
+	mtx_lock(&Giant);
 
 	kbd_init_struct(kbd, UKBD_DRIVER_NAME, KB_OTHER, unit, 0, 0, 0);
 
@@ -869,9 +869,6 @@
 	if (bootverbose) {
 		genkbd_diag(kbd, bootverbose);
 	}
-	/* lock keyboard mutex */
-
-	mtx_lock(&Giant);
 
 	/* start the keyboard */
 
@@ -894,7 +891,7 @@
 	struct ukbd_softc *sc = device_get_softc(dev);
 	int error;
 
-	mtx_assert(&Giant, MA_OWNED);
+	mtx_lock(&Giant);
 
 	DPRINTF("\n");
 
@@ -931,6 +928,8 @@
 
 	usb_callout_drain(&sc->sc_callout);
 
+	mtx_unlock(&Giant);
+
 	DPRINTF("%s: disconnected\n",
 	    device_get_nameunit(dev));
 
@@ -942,9 +941,9 @@
 {
 	struct ukbd_softc *sc = device_get_softc(dev);
 
-	mtx_assert(&Giant, MA_OWNED);
-
+	mtx_lock(&Giant);
 	ukbd_clear_state(&sc->sc_kbd);
+	mtx_unlock(&Giant);
 
 	return (0);
 }