| Message ID | 20211210085219.16796-2-pavel.hofman@ivitera.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ca5737396927afd4d57b133fd2874bbcf3421cdb |
| Headers | show |
| Series | [1/2] usb: core: config: fix validation of wMaxPacketValue entries | expand |
On Fri, Dec 10, 2021 at 09:52:19AM +0100, Pavel Hofman wrote: > Using standard USB_EP_MAXP_MULT_MASK instead of individual bits for > extracting multiple-transactions bits from wMaxPacketSize value. > > Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com> > --- Acked-by: Alan Stern <stern@rowland.harvard.edu> > drivers/usb/core/config.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c > index 74eb356c8767..00e28456e4cc 100644 > --- a/drivers/usb/core/config.c > +++ b/drivers/usb/core/config.c > @@ -422,9 +422,9 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, > maxpacket_maxes = full_speed_maxpacket_maxes; > break; > case USB_SPEED_HIGH: > - /* Bits 12..11 are allowed only for HS periodic endpoints */ > + /* Multiple-transactions bits are allowed only for HS periodic endpoints */ > if (usb_endpoint_xfer_int(d) || usb_endpoint_xfer_isoc(d)) { > - i = maxp & (BIT(12) | BIT(11)); > + i = maxp & USB_EP_MAXP_MULT_MASK; > maxp &= ~i; > } > fallthrough; > -- > 2.25.1 >
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index 74eb356c8767..00e28456e4cc 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -422,9 +422,9 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, maxpacket_maxes = full_speed_maxpacket_maxes; break; case USB_SPEED_HIGH: - /* Bits 12..11 are allowed only for HS periodic endpoints */ + /* Multiple-transactions bits are allowed only for HS periodic endpoints */ if (usb_endpoint_xfer_int(d) || usb_endpoint_xfer_isoc(d)) { - i = maxp & (BIT(12) | BIT(11)); + i = maxp & USB_EP_MAXP_MULT_MASK; maxp &= ~i; } fallthrough;
Using standard USB_EP_MAXP_MULT_MASK instead of individual bits for extracting multiple-transactions bits from wMaxPacketSize value. Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com> --- drivers/usb/core/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)