From owner-p4-projects@FreeBSD.ORG  Mon Feb 16 10:26:58 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 91334106567C; Mon, 16 Feb 2009 10:26:58 +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 4EFB41065678
	for <perforce@FreeBSD.org>; Mon, 16 Feb 2009 10:26:58 +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 3B6C28FC13
	for <perforce@FreeBSD.org>; Mon, 16 Feb 2009 10:26:58 +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 n1GAQwxl058418
	for <perforce@FreeBSD.org>; Mon, 16 Feb 2009 10:26:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1GAQwWu058416
	for perforce@freebsd.org; Mon, 16 Feb 2009 10:26:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 16 Feb 2009 10:26:58 GMT
Message-Id: <200902161026.n1GAQwWu058416@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 157783 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, 16 Feb 2009 10:26:59 -0000

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

Change 157783 by hselasky@hselasky_laptop001 on 2009/02/16 10:26:48

	
	libusb20: Make return value compatible with libusb0.12.x in
	case of a USB transfer timeout.

Affected files ...

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

Differences ...

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

@@ -32,6 +32,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <errno.h>
 
 #include "libusb20.h"
 #include "libusb20_desc.h"
@@ -617,9 +618,16 @@
 			libusb20_dev_wait_process((void *)dev, -1);
 		}
 
-		if (libusb20_tr_get_status(xfer)) {
-			/* transfer error */
-			return (-1);
+		switch (libusb20_tr_get_status(xfer)) {
+		case 0:
+			/* success */
+			break;
+		case LIBUSB20_TRANSFER_TIMED_OUT:
+			/* transfer timeout */
+			return (-ETIMEDOUT);
+		default:
+			/* other transfer error */
+			return (-ENXIO);
 		}
 		actlen = libusb20_tr_get_actual_length(xfer);