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

Commit 55fd939e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some small USB fixes for 4.13-rc2.

  The usual batch, gadget fixes for reported issues, as well as xhci
  fixes, and a small random collection of other fixes for reported
  issues.

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

* tag 'usb-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (25 commits)
  xhci: fix memleak in xhci_run()
  usb: xhci: fix spinlock recursion for USB2 test mode
  xhci: fix 20000ms port resume timeout
  usb: xhci: Issue stop EP command only when the EP state is running
  xhci: Bad Ethernet performance plugged in ASM1042A host
  xhci: Fix NULL pointer dereference when cleaning up streams for removed host
  usb: renesas_usbhs: gadget: disable all eps when the driver stops
  usb: renesas_usbhs: fix usbhsc_resume() for !USBHSF_RUNTIME_PWCTRL
  usb: gadget: udc: renesas_usb3: protect usb3_ep->started in usb3_start_pipen()
  usb: gadget: udc: renesas_usb3: fix zlp transfer by the dmac
  usb: gadget: udc: renesas_usb3: fix free size in renesas_usb3_dma_free_prd()
  usb: gadget: f_uac2: endianness fixes.
  usb: gadget: f_uac1: endianness fixes.
  include: usb: audio: specify exact endiannes of descriptors
  usb: gadget: udc: start_udc() can be static
  usb: dwc2: gadget: On USB RESET reset device address to zero
  usb: storage: return on error to avoid a null pointer dereference
  usb: typec: include linux/device.h in ucsi.h
  USB: cdc-acm: add device-id for quirky printer
  usb: dwc3: gadget: only unmap requests from DMA if mapped
  ...
parents bcb53e57 d6f5f071

drivers/usb/class/cdc-acm.c

+3 −0
Original line number Diff line number Diff line
@@ -1829,6 +1829,9 @@ static const struct usb_device_id acm_ids[] = { 
	{ USB_DEVICE(0x1576, 0x03b1), /* Maretron USB100 */

	.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */

	},

	{ USB_DEVICE(0xfff0, 0x0100), /* DATECS FP-2000 */

	.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */

	},



	{ USB_DEVICE(0x2912, 0x0001), /* ATOL FPrint */

	.driver_info = CLEAR_HALT_CONDITIONS,

drivers/usb/dwc2/gadget.c

+3 −0
Original line number Diff line number Diff line
@@ -3573,6 +3573,9 @@ static irqreturn_t dwc2_hsotg_irq(int irq, void *pw) 
		/* Report disconnection if it is not already done. */

		dwc2_hsotg_disconnect(hsotg);



		/* Reset device address to zero */

		__bic32(hsotg->regs + DCFG, DCFG_DEVADDR_MASK);



		if (usb_status & GOTGCTL_BSESVLD && connected)

			dwc2_hsotg_core_init_disconnected(hsotg, true);

	}

drivers/usb/dwc3/core.c

+3 −3
Original line number Diff line number Diff line
@@ -766,15 +766,15 @@ static int dwc3_core_init(struct dwc3 *dwc) 
			dwc->maximum_speed = USB_SPEED_HIGH;

	}



	ret = dwc3_core_soft_reset(dwc);

	ret = dwc3_core_get_phy(dwc);

	if (ret)

		goto err0;



	ret = dwc3_phy_setup(dwc);

	ret = dwc3_core_soft_reset(dwc);

	if (ret)

		goto err0;



	ret = dwc3_core_get_phy(dwc);

	ret = dwc3_phy_setup(dwc);

	if (ret)

		goto err0;

drivers/usb/dwc3/dwc3-omap.c

+8 −10
Original line number Diff line number Diff line
@@ -512,15 +512,6 @@ static int dwc3_omap_probe(struct platform_device *pdev) 


	/* check the DMA Status */

	reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG);

	irq_set_status_flags(omap->irq, IRQ_NOAUTOEN);

	ret = devm_request_threaded_irq(dev, omap->irq, dwc3_omap_interrupt,

					dwc3_omap_interrupt_thread, IRQF_SHARED,

					"dwc3-omap", omap);

	if (ret) {

		dev_err(dev, "failed to request IRQ #%d --> %d\n",

				omap->irq, ret);

		goto err1;

	}



	ret = dwc3_omap_extcon_register(omap);

	if (ret < 0)
@@ -532,8 +523,15 @@ static int dwc3_omap_probe(struct platform_device *pdev) 
		goto err1;

	}



	ret = devm_request_threaded_irq(dev, omap->irq, dwc3_omap_interrupt,

					dwc3_omap_interrupt_thread, IRQF_SHARED,

					"dwc3-omap", omap);

	if (ret) {

		dev_err(dev, "failed to request IRQ #%d --> %d\n",

			omap->irq, ret);

		goto err1;

	}

	dwc3_omap_enable_irqs(omap);

	enable_irq(omap->irq);

	return 0;



err1:

drivers/usb/dwc3/gadget.c

+5 −3
Original line number Diff line number Diff line
@@ -191,15 +191,17 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, 


	req->started = false;

	list_del(&req->list);

	req->trb = NULL;

	req->remaining = 0;



	if (req->request.status == -EINPROGRESS)

		req->request.status = status;



	if (req->trb)

		usb_gadget_unmap_request_by_dev(dwc->sysdev,

						&req->request, req->direction);



	req->trb = NULL;



	trace_dwc3_gadget_giveback(req);



	spin_unlock(&dwc->lock);