From bb5f5dcba7fe5a94decfdd15b07d6d2ef15d701c Mon Sep 17 00:00:00 2001
From: Andre Herms <andre.herms@tec-venture.de>
Date: Thu, 19 Nov 2009 18:14:49 +0100
Subject: [PATCH] --- yaml --- r: 174976 b: refs/heads/master c:
 ec412b92dbe3ea839716853eea058d1bcc5e6ca4 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/usb/class/usbtmc.c | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9edd31d6fbac..4eb6a520ee12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7723de7e19b744144975a09c81777ec0f14ac5b3
+refs/heads/master: ec412b92dbe3ea839716853eea058d1bcc5e6ca4
diff --git a/trunk/drivers/usb/class/usbtmc.c b/trunk/drivers/usb/class/usbtmc.c
index 65965587c812..619cc9975209 100644
--- a/trunk/drivers/usb/class/usbtmc.c
+++ b/trunk/drivers/usb/class/usbtmc.c
@@ -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++;