| Message ID | 20200526124420.22160-1-oneukum@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | CDC-ACM: heed quirk also in error handling | expand |
On Tue, May 26, 2020 at 02:44:20PM +0200, Oliver Neukum wrote: > 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> > --- > 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 7678ae4afd53..be4543569822 100644 > --- a/drivers/usb/class/cdc-acm.c > +++ b/drivers/usb/class/cdc-acm.c > @@ -585,7 +585,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++) Trailing whitespace :( I'll go fix it up by hand... greg k-h
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 7678ae4afd53..be4543569822 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -585,7 +585,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); }
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") --- drivers/usb/class/cdc-acm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)