diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-03-14 18:45:10 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-03-14 18:45:10 +0000 |
| commit | f14324a7920bee90b63469ce754e8040933f38e1 (patch) | |
| tree | 0077407e46ff904efd4601b99932c9abfd894030 /backend/usb-libusb.c | |
| parent | c8fef167ba1e9d5d87fc77e4e99ca12ba9384cbb (diff) | |
| download | cups-f14324a7920bee90b63469ce754e8040933f38e1.tar.gz | |
Merge changes from CUPS 1.5svn-r9602.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3046 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/usb-libusb.c')
| -rw-r--r-- | backend/usb-libusb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c index 2c2d73e56..08af5997a 100644 --- a/backend/usb-libusb.c +++ b/backend/usb-libusb.c @@ -411,7 +411,7 @@ get_device_id(usb_printer_t *printer, /* I - Printer */ if (usb_control_msg(printer->handle, USB_TYPE_CLASS | USB_ENDPOINT_IN | USB_RECIP_INTERFACE, - 0, printer->conf, printer->iface, + 0, printer->conf, (printer->iface << 8) | printer->altset, buffer, bufsize, 5000) < 0) { *buffer = '\0'; @@ -675,6 +675,7 @@ open_device(usb_printer_t *printer, /* I - Printer */ goto error; } +#if 0 /* STR #3801: Claiming interface 0 causes problems with some printers */ if (number != 0) while (usb_claim_interface(printer->handle, 0) < 0) { @@ -685,6 +686,7 @@ open_device(usb_printer_t *printer, /* I - Printer */ goto error; } +#endif /* 0 */ /* * Set alternate setting... |