From owner-p4-projects@FreeBSD.ORG  Thu Nov 13 17:21:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CC0911065673; Thu, 13 Nov 2008 17:21:24 +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 9055C1065670
	for <perforce@FreeBSD.org>; Thu, 13 Nov 2008 17:21:24 +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 87F228FC08
	for <perforce@FreeBSD.org>; Thu, 13 Nov 2008 17:21:24 +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 mADHLOCK055135
	for <perforce@FreeBSD.org>; Thu, 13 Nov 2008 17:21:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mADHLOro055133
	for perforce@freebsd.org; Thu, 13 Nov 2008 17:21:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 13 Nov 2008 17:21:24 GMT
Message-Id: <200811131721.mADHLOro055133@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 152938 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: Thu, 13 Nov 2008 17:21:25 -0000

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

Change 152938 by hselasky@hselasky_laptop001 on 2008/11/13 17:20:52

	
	Don't poll standard input because libusb
	will not ensure that its data gets read.

Affected files ...

.. //depot/projects/usb/src/lib/libusb20/libusb20.c#10 edit

Differences ...

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

@@ -886,7 +886,7 @@
 void
 libusb20_dev_wait_process(struct libusb20_device *pdev, int timeout)
 {
-	struct pollfd pfd[2];
+	struct pollfd pfd[1];
 
 	if (!pdev->is_opened) {
 		return;
@@ -894,11 +894,8 @@
 	pfd[0].fd = pdev->file;
 	pfd[0].events = (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM);
 	pfd[0].revents = 0;
-	pfd[1].fd = 0;			/* standard input */
-	pfd[1].events = (POLLIN | POLLRDNORM);
-	pfd[1].revents = 0;
 
-	if (poll(pfd, 2, timeout)) {
+	if (poll(pfd, 1, timeout)) {
 		/* ignore any error */
 	}
 	return;