summaryrefslogtreecommitdiffstats
path: root/daemon
diff options
context:
space:
mode:
authorGravatar Hector Martin2009-12-07 07:02:56 +0100
committerGravatar Hector Martin2009-12-07 07:02:56 +0100
commit0c3941baef1928abcedd9d0de5ed34e7fa689b39 (patch)
treef3ccccc3b73eb07e2e8f8fad76369a63c0bb0553 /daemon
parent2a32789c0c431b312908b2b8fad3aa780058a238 (diff)
downloadusbmuxd-0c3941baef1928abcedd9d0de5ed34e7fa689b39.tar.gz
usbmuxd-0c3941baef1928abcedd9d0de5ed34e7fa689b39.tar.bz2
Get rid of SHORT_NOT_OK flag for USB sends
This flag is useful for reads only (and we don't want it on our reads anyway). In DEBUG mode, the USB kernel driver is anal about this useless flag and reports an error.
Diffstat (limited to 'daemon')
-rw-r--r--daemon/usb-linux.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/daemon/usb-linux.c b/daemon/usb-linux.c
index 687e965..c334ef3 100644
--- a/daemon/usb-linux.c
+++ b/daemon/usb-linux.c
@@ -136,7 +136,6 @@ int usb_send(struct usb_device *dev, const unsigned char *buf, int length)
136 int res; 136 int res;
137 struct libusb_transfer *xfer = libusb_alloc_transfer(0); 137 struct libusb_transfer *xfer = libusb_alloc_transfer(0);
138 libusb_fill_bulk_transfer(xfer, dev->dev, BULK_OUT, (void*)buf, length, tx_callback, dev, 0); 138 libusb_fill_bulk_transfer(xfer, dev->dev, BULK_OUT, (void*)buf, length, tx_callback, dev, 0);
139 xfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK;
140 if((res = libusb_submit_transfer(xfer)) < 0) { 139 if((res = libusb_submit_transfer(xfer)) < 0) {
141 usbmuxd_log(LL_ERROR, "Failed to submit TX transfer %p len %d to device %d-%d: %d", buf, length, dev->bus, dev->address, res); 140 usbmuxd_log(LL_ERROR, "Failed to submit TX transfer %p len %d to device %d-%d: %d", buf, length, dev->bus, dev->address, res);
142 libusb_free_transfer(xfer); 141 libusb_free_transfer(xfer);
@@ -149,7 +148,6 @@ int usb_send(struct usb_device *dev, const unsigned char *buf, int length)
149 xfer = libusb_alloc_transfer(0); 148 xfer = libusb_alloc_transfer(0);
150 void *buffer = malloc(1); 149 void *buffer = malloc(1);
151 libusb_fill_bulk_transfer(xfer, dev->dev, BULK_OUT, buffer, 0, tx_callback, dev, 0); 150 libusb_fill_bulk_transfer(xfer, dev->dev, BULK_OUT, buffer, 0, tx_callback, dev, 0);
152 xfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK;
153 if((res = libusb_submit_transfer(xfer)) < 0) { 151 if((res = libusb_submit_transfer(xfer)) < 0) {
154 usbmuxd_log(LL_ERROR, "Failed to submit TX ZLP transfer to device %d-%d: %d", dev->bus, dev->address, res); 152 usbmuxd_log(LL_ERROR, "Failed to submit TX ZLP transfer to device %d-%d: %d", dev->bus, dev->address, res);
155 libusb_free_transfer(xfer); 153 libusb_free_transfer(xfer);