The libusb-based USB backend incorrectly used write timeouts

(<rdar://problem/15564888>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11456 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 9b0ea2df9a5d84134b9fca0b36697ffeaa45f27f..4d25f2bb26d5a58d9557f01bd08f8a75ecb392fb 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 1.7.1 - 2013-12-05
+CHANGES.txt - 1.7.1 - 2013-12-09
 --------------------------------
 
 CHANGES IN CUPS V1.7.1
@@ -22,6 +22,8 @@ CHANGES IN CUPS V1.7.1
        - Japanese PPDs using with the Shift-JIS encoding did not work
          (<rdar://problem/15427759>)
        - "tel:" URIs incorrectly had slashes (<rdar://problem/15418463>)
+       - The libusb-based USB backend incorrectly used write timeouts
+         (<rdar://problem/15564888>)
 
 
 CHANGES IN CUPS V1.7.0

diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index 20c3d1b56804abf888b1390d83db06b407034eb1..0a9162645bbb8715ac80dbc63367eea9f02c786a 100644 (file)
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -496,7 +496,7 @@ print_device(const char *uri,               /* I - Device URI */
        iostatus = libusb_bulk_transfer(g.printer->handle,
                                        g.printer->write_endp,
                                        print_buffer, g.print_bytes,
-                                       &bytes, 60000);
+                                       &bytes, 0);
        /*
        * Ignore timeout errors, but retain the number of bytes written to
        * avoid sending duplicate data...
@@ -519,7 +519,7 @@ print_device(const char *uri,               /* I - Device URI */
          iostatus = libusb_bulk_transfer(g.printer->handle,
                                          g.printer->write_endp,
                                          print_buffer, g.print_bytes,
-                                         &bytes, 60000);
+                                         &bytes, 0);
        }
 
        /*
@@ -534,7 +534,7 @@ print_device(const char *uri,               /* I - Device URI */
          iostatus = libusb_bulk_transfer(g.printer->handle,
                                          g.printer->write_endp,
                                          print_buffer, g.print_bytes,
-                                         &bytes, 60000);
+                                         &bytes, 0);
         }
 
        if (iostatus)