Commit 368afecb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-5.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are some small, last-minute, USB driver fixes for 5.11-rc7

  They all resolve issues reported, or are a few new device ids for some
  drivers. They include:

   - new device ids for some usb-serial drivers

   - xhci fixes for a variety of reported problems

   - dwc3 driver bugfixes

   - dwc2 driver bugfixes

   - usblp driver bugfix

   - thunderbolt bugfix

   - few other tiny fixes

  All have been in linux-next with no reported issues"

* tag 'usb-5.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: dwc2: Fix endpoint direction check in ep_from_windex
  usb: dwc3: fix clock issue during resume in OTG mode
  xhci: fix bounce buffer usage for non-sg list case
  usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720
  usb: xhci-mtk: break loop when find the endpoint to drop
  usb: xhci-mtk: skip dropping bandwidth of unchecked endpoints
  usb: renesas_usbhs: Clear pipe running flag in usbhs_pkt_pop()
  USB: gadget: legacy: fix an error code in eth_bind()
  thunderbolt: Fix possible NULL pointer dereference in tb_acpi_add_link()
  USB: serial: option: Adding support for Cinterion MV31
  usb: xhci-mtk: fix unreleased bandwidth data
  usb: gadget: aspeed: add missing of_node_put
  USB: usblp: don't call usb_set_interface if there's a single alt
  USB: serial: cp210x: add pid/vid for WSDA-200-USB
  USB: serial: cp210x: add new VID/PID for supporting Teraoka AD2000
parents 7c2d1835 f670e9f9

drivers/thunderbolt/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static acpi_status tb_acpi_add_link(acpi_handle handle, u32 level, void *data, 
	 * managed with the xHCI and the SuperSpeed hub so we create the

	 * link from xHCI instead.

	 */

	while (!dev_is_pci(dev))

	while (dev && !dev_is_pci(dev))

		dev = dev->parent;



	if (!dev)

drivers/usb/class/usblp.c

+11 −8
Original line number Diff line number Diff line
@@ -1329,6 +1329,8 @@ static int usblp_set_protocol(struct usblp *usblp, int protocol) 
	if (protocol < USBLP_FIRST_PROTOCOL || protocol > USBLP_LAST_PROTOCOL)

		return -EINVAL;



	/* Don't unnecessarily set the interface if there's a single alt. */

	if (usblp->intf->num_altsetting > 1) {

		alts = usblp->protocol[protocol].alt_setting;

		if (alts < 0)

			return -EINVAL;
@@ -1338,6 +1340,7 @@ static int usblp_set_protocol(struct usblp *usblp, int protocol) 
				alts, usblp->ifnum);

			return r;

		}

	}



	usblp->bidir = (usblp->protocol[protocol].epread != NULL);

	usblp->current_protocol = protocol;

drivers/usb/dwc2/gadget.c

+1 −7
Original line number Diff line number Diff line
@@ -1543,7 +1543,6 @@ static void dwc2_hsotg_complete_oursetup(struct usb_ep *ep, 
static struct dwc2_hsotg_ep *ep_from_windex(struct dwc2_hsotg *hsotg,

					    u32 windex)

{

	struct dwc2_hsotg_ep *ep;

	int dir = (windex & USB_DIR_IN) ? 1 : 0;

	int idx = windex & 0x7F;
@@ -1553,12 +1552,7 @@ static struct dwc2_hsotg_ep *ep_from_windex(struct dwc2_hsotg *hsotg, 
	if (idx > hsotg->num_of_eps)

		return NULL;



	ep = index_to_ep(hsotg, idx, dir);



	if (idx && ep->dir_in != dir)

		return NULL;



	return ep;

	return index_to_ep(hsotg, idx, dir);

}



/**

drivers/usb/dwc3/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1758,7 +1758,7 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) 
		if (PMSG_IS_AUTO(msg))

			break;



		ret = dwc3_core_init(dwc);

		ret = dwc3_core_init_for_resume(dwc);

		if (ret)

			return ret;

drivers/usb/gadget/legacy/ether.c

+3 −1
Original line number Diff line number Diff line
@@ -403,8 +403,10 @@ static int eth_bind(struct usb_composite_dev *cdev) 
		struct usb_descriptor_header *usb_desc;



		usb_desc = usb_otg_descriptor_alloc(gadget);

		if (!usb_desc)

		if (!usb_desc) {

			status = -ENOMEM;

			goto fail1;

		}

		usb_otg_descriptor_init(gadget, usb_desc);

		otg_desc[0] = usb_desc;

		otg_desc[1] = NULL;