40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 1eaf50e14dfdda654e6acb2a1ee4c18cff346064 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <1eaf50e14dfdda654e6acb2a1ee4c18cff346064.1604607313.git.stefan@agner.ch>
|
|
In-Reply-To: <d6fc5f89ac905cb3efc9c61ce79dbfad5d91883b.1604607313.git.stefan@agner.ch>
|
|
References: <d6fc5f89ac905cb3efc9c61ce79dbfad5d91883b.1604607313.git.stefan@agner.ch>
|
|
From: Oliver Neukum <oneukum@suse.com>
|
|
Date: Tue, 26 May 2020 14:44:20 +0200
|
|
Subject: [PATCH 2/3] 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>
|
|
---
|
|
drivers/usb/class/cdc-acm.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
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);
|
|
}
|
|
--
|
|
2.29.1
|
|
|