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

Commit 60aac1ec authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: Handle bogus low-speed Bulk endpoints 



A noticeable number of low-speed devices mistakenly include
descriptors for Bulk endpoints, which is forbidden by the USB spec.
In an attempt to make such devices more usable, this patch (as924)
converts the descriptors to Interrupt with an interval of 1 ms.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 52f6b5e1

drivers/usb/core/config.c

+15 −0
Original line number Diff line number Diff line
@@ -124,6 +124,21 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum, 
		endpoint->desc.bInterval = n;

	}



	/* Some buggy low-speed devices have Bulk endpoints, which is

	 * explicitly forbidden by the USB spec.  In an attempt to make

	 * them usable, we will try treating them as Interrupt endpoints.

	 */

	if (to_usb_device(ddev)->speed == USB_SPEED_LOW &&

			usb_endpoint_xfer_bulk(d)) {

		dev_warn(ddev, "config %d interface %d altsetting %d "

		    "endpoint 0x%X is Bulk; changing to Interrupt\n",

		    cfgno, inum, asnum, d->bEndpointAddress);

		endpoint->desc.bmAttributes = USB_ENDPOINT_XFER_INT;

		endpoint->desc.bInterval = 1;

		if (le16_to_cpu(endpoint->desc.wMaxPacketSize) > 8)

			endpoint->desc.wMaxPacketSize = cpu_to_le16(8);

	}



	/* Skip over any Class Specific or Vendor Specific descriptors;

	 * find the next endpoint or interface descriptor */

	endpoint->extra = buffer;