diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 22:47:15 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 22:47:15 -0400 |
commit | dbf7603a92cd895b8c1017734bc30fd9a32fd933 (patch) | |
tree | 7e0e8c35d5db964ee43494a721dee3c486e4e458 /drivers/usb/class/usbtmc.c | |
parent | 044c31fdf80ed9d8e6bfb33913d085c3efc6febe (diff) | |
parent | d31bf2883542cd3414674238f94123bd1d9c0b9f (diff) |
Merge commit 'v3.0.3' into linaro-3.0linux-linaro-3.0-2011.08-0
Diffstat (limited to 'drivers/usb/class/usbtmc.c')
-rw-r--r-- | drivers/usb/class/usbtmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 385acb895ab..3f94ac34dce 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -268,7 +268,7 @@ usbtmc_abort_bulk_in_status: 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) { |