From 6aa0a549817a8e7827243ca870efef1c0d2c63e4 Mon Sep 17 00:00:00 2001 From: msweet Date: Mon, 9 Dec 2013 19:26:47 +0000 Subject: [PATCH] The libusb-based USB backend incorrectly used write timeouts () git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11456 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 4 +++- backend/usb-libusb.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 9b0ea2df9a..4d25f2bb26 100644 --- 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 () - "tel:" URIs incorrectly had slashes () + - The libusb-based USB backend incorrectly used write timeouts + () CHANGES IN CUPS V1.7.0 diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c index 20c3d1b568..0a9162645b 100644 --- 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) -- 2.47.2