From owner-p4-projects@FreeBSD.ORG  Mon Jun 18 14:06:46 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A9A3C16A46F; Mon, 18 Jun 2007 14:06:45 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 84CF816A469
	for <perforce@FreeBSD.org>; Mon, 18 Jun 2007 14:06:45 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 60E2613C48A
	for <perforce@FreeBSD.org>; Mon, 18 Jun 2007 14:06:45 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5IE6jWS007655
	for <perforce@FreeBSD.org>; Mon, 18 Jun 2007 14:06:45 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IE6j4C007648
	for perforce@freebsd.org; Mon, 18 Jun 2007 14:06:45 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Mon, 18 Jun 2007 14:06:45 GMT
Message-Id: <200706181406.l5IE6j4C007648@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 121914 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, 18 Jun 2007 14:06:46 -0000

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

Change 121914 by rpaulo@rpaulo_epsilon on 2007/06/18 14:06:34

	Move the usb quirk check a little above to avoid a memory
	leak.	

Affected files ...

.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#9 edit

Differences ...

==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#9 (text+ko) ====

@@ -169,6 +169,9 @@
 	void *desc;
 	usbd_status err;
 
+	if (usbd_get_quirks(uaa->device)->uq_flags & UQ_MS_IGNORE)
+		return (UMATCH_NONE);
+
 	if (!uaa->iface)
 		return (UMATCH_NONE);
 	id = usbd_get_interface_descriptor(uaa->iface);
@@ -179,9 +182,6 @@
 	if (err)
 		return (UMATCH_NONE);
 
-	if (usbd_get_quirks(uaa->device)->uq_flags & UQ_MS_IGNORE)
-		return (UMATCH_NONE);
-
 	if (hid_is_collection(desc, size,
 			      HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE)))
 		ret = UMATCH_IFACECLASS;