Commit c34a4f9d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v5.7-rc5' of... 

Merge tag 'fixes-for-v5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into usb-linus

Felipe writes:

USB: fixes for v5.7-rc5

Fixing raw-gadget's IOCTL return value. Enabling EXTCON for Intel
Merrifield. Couple leaks have been plugged in net2272 and
twl6030-usb. Returning an error code when things fail in cdc and ncm
legacy gadgets. An old bug on dwc3 regarding HWO bit handling has been
fixed.

Apart from these, some minor fixes.

Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>

* tag 'fixes-for-v5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
  usb: raw-gadget: fix return value of ep read ioctls
  usb: dwc3: select USB_ROLE_SWITCH
  usb: gadget: legacy: fix error return code in gncm_bind()
  usb: gadget: legacy: fix error return code in cdc_bind()
  usb: gadget: legacy: fix redundant initialization warnings
  usb: gadget: tegra-xudc: Fix idle suspend/resume
  usb: gadget: net2272: Fix a memory leak in an error handling path in 'net2272_plat_probe()'
  usb: phy: twl6030-usb: Fix a resource leak in an error handling path in 'twl6030_usb_probe()'
  usb: cdns3: gadget: prev_req->trb is NULL for ep0
  usb: gadget: audio: Fix a missing error return value in audio_bind()
  usb: dwc3: pci: Enable extcon driver for Intel Merrifield
  dwc3: Remove check for HWO flag in dwc3_gadget_ep_reclaim_trb_sg()
parents 2ef96a5b 6e507644

drivers/usb/cdns3/gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -2548,7 +2548,7 @@ found: 
	link_trb = priv_req->trb;



	/* Update ring only if removed request is on pending_req_list list */

	if (req_on_hw_ring) {

	if (req_on_hw_ring && link_trb) {

		link_trb->buffer = TRB_BUFFER(priv_ep->trb_pool_dma +

			((priv_req->end_trb + 1) * TRB_SIZE));

		link_trb->control = (link_trb->control & TRB_CYCLE) |

drivers/usb/dwc3/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config USB_DWC3 
	tristate "DesignWare USB3 DRD Core Support"

	depends on (USB || USB_GADGET) && HAS_DMA

	select USB_XHCI_PLATFORM if USB_XHCI_HCD

	select USB_ROLE_SWITCH if USB_DWC3_DUAL_ROLE

	help

	  Say Y or M here if your system has a Dual Role SuperSpeed

	  USB controller based on the DesignWare USB3 IP Core.

drivers/usb/dwc3/dwc3-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ static const struct property_entry dwc3_pci_intel_properties[] = { 


static const struct property_entry dwc3_pci_mrfld_properties[] = {

	PROPERTY_ENTRY_STRING("dr_mode", "otg"),

	PROPERTY_ENTRY_STRING("linux,extcon-name", "mrfld_bcove_pwrsrc"),

	PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),

	{}

};

drivers/usb/dwc3/gadget.c

+0 −3
Original line number Diff line number Diff line
@@ -2483,9 +2483,6 @@ static int dwc3_gadget_ep_reclaim_trb_sg(struct dwc3_ep *dep, 
	for_each_sg(sg, s, pending, i) {

		trb = &dep->trb_pool[dep->trb_dequeue];



		if (trb->ctrl & DWC3_TRB_CTRL_HWO)

			break;



		req->sg = sg_next(s);

		req->num_pending_sgs--;

drivers/usb/gadget/legacy/audio.c

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



		usb_desc = usb_otg_descriptor_alloc(cdev->gadget);

		if (!usb_desc)

		if (!usb_desc) {

			status = -ENOMEM;

			goto fail;

		}

		usb_otg_descriptor_init(cdev->gadget, usb_desc);

		otg_desc[0] = usb_desc;

		otg_desc[1] = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE