From 725360c999c07a9a2f23e61db9d3bb4ab0bd7f47 Mon Sep 17 00:00:00 2001 From: Maxim Nikulin Date: Sat, 9 Jul 2011 23:44:44 +0700 Subject: [PATCH] --- yaml --- r: 262913 b: refs/heads/master c: 4f1a7a3e78037721496283ea3e87cfefc64d99c7 h: refs/heads/master i: 262911: 174b992803edc239a54507375a44650791a28383 v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/usbtmc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0d835f72d9c3..6b5237a8ebbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e94c587e78811d95a5b0db094f984eeb99f86388 +refs/heads/master: 4f1a7a3e78037721496283ea3e87cfefc64d99c7 diff --git a/trunk/drivers/usb/class/usbtmc.c b/trunk/drivers/usb/class/usbtmc.c index 385acb895ab3..3f94ac34dce3 100644 --- a/trunk/drivers/usb/class/usbtmc.c +++ b/trunk/drivers/usb/class/usbtmc.c @@ -268,7 +268,7 @@ static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data) dev_err(dev, "usb_bulk_msg returned %d\n", rv); goto exit; } - } while ((actual = max_size) && + } while ((actual == max_size) && (n < USBTMC_MAX_READS_TO_CLEAR_BULK_IN)); if (actual == max_size) {