summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2020-05-26 14:44:20 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-10 21:35:00 +0200
commitb7bf32f76dd255646dcb2d9a8f5e61f8b8be7120 (patch)
tree7e24eddb428ea74de7846c934b585bda5ee6d867 /drivers
parent695fd932ac5c18364498091e17e463ff269132ab (diff)
downloadlinux-stable-b7bf32f76dd255646dcb2d9a8f5e61f8b8be7120.tar.gz
linux-stable-b7bf32f76dd255646dcb2d9a8f5e61f8b8be7120.tar.bz2
linux-stable-b7bf32f76dd255646dcb2d9a8f5e61f8b8be7120.zip
CDC-ACM: heed quirk also in error handling
commit 97fe809934dd2b0b37dfef3a2fc70417f485d7af upstream. If buffers are iterated over in the error case, the lower limits for quirky devices must be heeded. Signed-off-by: Oliver Neukum <oneukum@suse.com> Reported-by: Jean Rene Dawin <jdawin@math.uni-bielefeld.de> Fixes: a4e7279cd1d19 ("cdc-acm: introduce a cool down") Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200526124420.22160-1-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/class/cdc-acm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 10ba1b4f0dbf..e8b9b27937ed 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -590,7 +590,7 @@ static void acm_softint(struct work_struct *work)
}
if (test_and_clear_bit(ACM_ERROR_DELAY, &acm->flags)) {
- for (i = 0; i < ACM_NR; i++)
+ for (i = 0; i < acm->rx_buflimit; i++)
if (test_and_clear_bit(i, &acm->urbs_in_error_delay))
acm_submit_read_urb(acm, i, GFP_NOIO);
}