PERFORCE change 157783 for review

[Hans Petter Selasky]

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

Change 157783 by hselasky at 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);