Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d843b2b5 authored by Pavel Hofman's avatar Pavel Hofman Committed by Greg Kroah-Hartman
Browse files

usb: core: config: using bit mask instead of individual bits 



commit ca5737396927afd4d57b133fd2874bbcf3421cdb upstream.

Using standard USB_EP_MAXP_MULT_MASK instead of individual bits for
extracting multiple-transactions bits from wMaxPacketSize value.

Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarPavel Hofman <pavel.hofman@ivitera.com>
Link: https://lore.kernel.org/r/20211210085219.16796-2-pavel.hofman@ivitera.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5054e9ae

drivers/usb/core/config.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -425,9 +425,9 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, 
		maxpacket_maxes = full_speed_maxpacket_maxes;

		maxpacket_maxes = full_speed_maxpacket_maxes;

		break;

		break;

	case USB_SPEED_HIGH:

	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)) {

		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;

			maxp &= ~i;

		}

		}

		/* fallthrough */

		/* fallthrough */