From owner-p4-projects@FreeBSD.ORG  Sat Nov  7 01:25:03 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DBE221065679; Sat,  7 Nov 2009 01:25:02 +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 A074D106566C
	for <perforce@FreeBSD.org>; Sat,  7 Nov 2009 01:25:02 +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 8DF178FC1C
	for <perforce@FreeBSD.org>; Sat,  7 Nov 2009 01:25:02 +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 nA71P2lv011566
	for <perforce@FreeBSD.org>; Sat, 7 Nov 2009 01:25:02 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA71P2oO011564
	for perforce@freebsd.org; Sat, 7 Nov 2009 01:25:02 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 7 Nov 2009 01:25:02 GMT
Message-Id: <200911070125.nA71P2oO011564@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 170307 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: Sat, 07 Nov 2009 01:25:03 -0000

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

Change 170307 by hselasky@hselasky_laptop001 on 2009/11/07 01:24:09

	
	LibUSB v1.0 only:
	  - fix refcounting error during data transfer
	  - reported by Robert Jenssen

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb10_io.c#9 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#9 (text+ko) ====

@@ -148,19 +148,19 @@
 		goto do_done;
 	}
 	for (i = 0; i != nfds; i++) {
-		if (fds[i].revents == 0)
-			continue;
 		if (ppdev[i] != NULL) {
 			dev = libusb_get_device(ppdev[i]);
 
-			err = libusb20_dev_process(ppdev[i]);
+			if (fds[i].revents == 0)
+				err = 0;	/* nothing to do */
+			else
+				err = libusb20_dev_process(ppdev[i]);
+
 			if (err) {
 				/* cancel all transfers - device is gone */
 				libusb10_cancel_all_transfer(dev);
-				/*
-				 * make sure we don't go into an infinite
-				 * loop
-				 */
+
+				/* remove USB device from polling loop */
 				libusb10_remove_pollfd(dev->ctx, &dev->dev_poll);
 			}
 			CTX_UNLOCK(ctx);