From owner-p4-projects@FreeBSD.ORG  Fri Jan 22 18:53:22 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D1E7B1065672; Fri, 22 Jan 2010 18:53:22 +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 9588B106566B
	for <perforce@FreeBSD.org>; Fri, 22 Jan 2010 18:53:22 +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 820C58FC14
	for <perforce@FreeBSD.org>; Fri, 22 Jan 2010 18:53:22 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0MIrMEk094870
	for <perforce@FreeBSD.org>; Fri, 22 Jan 2010 18:53:22 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0MIrMOm094868
	for perforce@freebsd.org; Fri, 22 Jan 2010 18:53:22 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 22 Jan 2010 18:53:22 GMT
Message-Id: <201001221853.o0MIrMOm094868@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 173532 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 22 Jan 2010 18:53:23 -0000

http://p4web.freebsd.org/chv.cgi?CH=173532

Change 173532 by hselasky@hselasky_laptop001 on 2010/01/22 18:52:27

	USB quirk:
		- add missing mutex unlocks after last patch.
		- patch by: HPS

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#19 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#19 (text+ko) ====

@@ -681,8 +681,10 @@
 		mtx_lock(&usb_quirk_mtx);
 		pqe = usb_quirk_get_entry(pgq->vid, pgq->pid,
 		    pgq->bcdDeviceLow, pgq->bcdDeviceHigh, 1);
-		if (pqe == NULL)
+		if (pqe == NULL) {
+			mtx_unlock(&usb_quirk_mtx);
 			return (EINVAL);
+		}
 		for (x = 0; x != USB_SUB_QUIRKS_MAX; x++) {
 			if (pqe->quirks[x] == UQ_NONE) {
 				pqe->quirks[x] = y;
@@ -717,8 +719,10 @@
 		mtx_lock(&usb_quirk_mtx);
 		pqe = usb_quirk_get_entry(pgq->vid, pgq->pid,
 		    pgq->bcdDeviceLow, pgq->bcdDeviceHigh, 0);
-		if (pqe == NULL)
+		if (pqe == NULL) {
+			mtx_unlock(&usb_quirk_mtx);
 			return (EINVAL);
+		}
 		for (x = 0; x != USB_SUB_QUIRKS_MAX; x++) {
 			if (pqe->quirks[x] == y) {
 				pqe->quirks[x] = UQ_NONE;