---

yaml --- r: 165011 b: refs/heads/master c: 4143d17 h: refs/heads/master i: 165009: 71a6fae 165007: 5014946 v: v3
git-mirror · Sep 23, 2009 · 3f5120d · 3f5120d
1 parent 5626f6a
commit 3f5120d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92d07e422df3cc5370d0d9b95a671abb69d50ef1
+refs/heads/master: 4143d178e7b39c00d5277040c69a1522c4d98871
diff --git a/trunk/drivers/usb/class/usbtmc.c b/trunk/drivers/usb/class/usbtmc.c
@@ -485,7 +485,8 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
 		}
 
 		done += n_characters;
-		if (n_characters < USBTMC_SIZE_IOBUFFER)
+		/* Terminate if end-of-message bit recieved from device */
+		if ((buffer[8] &  0x01) && (actual >= n_characters + 12))
 			remaining = 0;
 		else
 			remaining -= n_characters;