From 3f5120dc2a02cd1e3e95e2a931335fe28f35c31b Mon Sep 17 00:00:00 2001
From: Steve Holland <sdh4@iastate.edu>
Date: Thu, 18 Jun 2009 17:37:49 -0500
Subject: [PATCH] --- yaml --- r: 165011 b: refs/heads/master c:
 4143d178e7b39c00d5277040c69a1522c4d98871 h: refs/heads/master i:   165009:
 71a6fae028cd2c633b2c8ead44c3badf30ae6b76   165007:
 5014946d4c0d436f6efc0facf42295ba1fd9d864 v: v3

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

diff --git a/[refs] b/[refs]
index b2afd5f32107..7f561bcf4d29 100644
--- 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
index 91d3a94eeaa0..6395f22a58e1 100644
--- 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;