From owner-p4-projects@FreeBSD.ORG  Sun Nov 16 11:55:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 66E1D1065675; Sun, 16 Nov 2008 11:55:20 +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 2AFCF1065670
	for <perforce@FreeBSD.org>; Sun, 16 Nov 2008 11:55:20 +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 19BA88FC1C
	for <perforce@FreeBSD.org>; Sun, 16 Nov 2008 11:55:20 +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 mAGBtJEQ025255
	for <perforce@FreeBSD.org>; Sun, 16 Nov 2008 11:55:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAGBtJ2u025253
	for perforce@freebsd.org; Sun, 16 Nov 2008 11:55:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 16 Nov 2008 11:55:19 GMT
Message-Id: <200811161155.mAGBtJ2u025253@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 153028 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: Sun, 16 Nov 2008 11:55:20 -0000

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

Change 153028 by hselasky@hselasky_laptop001 on 2008/11/16 11:54:26

	
	Fix problem with dfu-util and libusb.

Affected files ...

.. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#8 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#8 (text+ko) ====

@@ -821,36 +821,28 @@
 	struct libusb20_device *pdev;
 	struct usb_device *udev;
 	struct LIBUSB20_DEVICE_DESC_DECODED *ddesc;
-	struct libusb20_backend *pold;
 	int err;
 
 	/* cleanup after last device search */
+	/* close all opened devices, if any */
 
-	pold = usb_backend;
-
-	pdev = NULL;
-	while ((pdev = libusb20_be_device_foreach(pold, pdev))) {
-		if (!pdev->is_opened) {
-			/*
-			 * if the device has not been opened we free the
-			 * device data
-			 */
-			udev = pdev->priv01Data;
-			libusb20_be_dequeue_device(pold, pdev);
-			libusb20_dev_free(pdev);
-			if (udev != NULL) {
-				LIST_DEL(usb_global_bus.devices, udev);
-				free(udev);
-			}
-			pdev = NULL;	/* restart search */
+	while ((pdev = libusb20_be_device_foreach(usb_backend, NULL))) {
+		udev = pdev->priv01Data;
+		libusb20_be_dequeue_device(usb_backend, pdev);
+		libusb20_dev_free(pdev);
+		if (udev != NULL) {
+			LIST_DEL(usb_global_bus.devices, udev);
+			free(udev);
 		}
 	}
 
+	/* free old USB backend, if any */
+
+	libusb20_be_free(usb_backend);
+
 	/* do a new backend device search */
-
 	usb_backend = libusb20_be_alloc_default();
 	if (usb_backend == NULL) {
-		usb_backend = pold;	/* restore */
 		return (-1);
 	}
 	/* iterate all devices */
@@ -904,17 +896,6 @@
 		LIST_ADD(usb_global_bus.devices, udev);
 	}
 
-	/* move old devices over to the new USB backend */
-
-	while ((pdev = libusb20_be_device_foreach(pold, pdev))) {
-		libusb20_be_dequeue_device(pold, pdev);
-		libusb20_be_enqueue_device(usb_backend, pdev);
-	}
-
-	/* free old backend, if any */
-
-	libusb20_be_free(pold);
-
 	return (0);			/* success */
 }