Skip to contentSkip to conversation

USB: usbtmc: repeat usb_bulk_msg until whole message is transfered

PATCH New Andre Herms 1 participant 1 message Nov 19, 2009 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 USB: usbtmc: repeat usb_bulk_msg until whole message is transfered

usb_bulk_msg() transfers only bytes up to the maximum packet size. It must be repeated by the usbtmc driver until all bytes of a TMC message are transfered.

Without this patch, ETIMEDOUT is reported when writing TMC messages larger than the maximum USB bulk size and the transfer remains incomplete. The user will notice that the device hangs and must be reset by either closing the application or pulling the plug.

---
 drivers/usb/class/usbtmc.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
drivers/usb/class/usbtmc.c +10 -4
index 2473cf0..d9461c9 100644
@@ -562,10 +562,16 @@ static ssize_t usbtmc_write(struct file *filp, const char __user *buf,
 		n_bytes = roundup(12 + this_part, 4);
 		memset(buffer + 12 + this_part, 0, n_bytes - (12 + this_part));
 
-		retval = usb_bulk_msg(data->usb_dev,
-				      usb_sndbulkpipe(data->usb_dev,
-						      data->bulk_out),
-				      buffer, n_bytes, &actual, USBTMC_TIMEOUT);
+		do {
+			retval = usb_bulk_msg(data->usb_dev,
+					      usb_sndbulkpipe(data->usb_dev,
+							      data->bulk_out),
+					      buffer, n_bytes,
+					      &actual, USBTMC_TIMEOUT);
+			if (retval != 0)
+				break;
+			n_bytes -= actual;
+		} while (n_bytes);
 
 		data->bTag_last_write = data->bTag;
 		data->bTag++;
Signature · 1 line
1.6.5.2