Commit 1a4af6ea authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'depends/usb-fixes' into next/drivers 

This is needed for the bcm2836 branch, pulling in the fixes
that went into rc5 to avoid a larger backmerge.

* depends/usb-fixes:
  usb: dwc2: fix kernel oops during driver probe
  usb: phy: mxs: add "fsl,imx6ul-usbphy" compatible string
  usb: gadget: f_midi: fix leak on failed to enqueue out requests
  usb: gadget: f_midi: Transmit data only when IN ep is enabled
  usb: dwc2: make otg clk optional
  usb: dwc2: Return errors from PHY
  usb: dwc2: Make PHY optional
  usb: renesas_usbhs: gadget: Fix NULL pointer dereference in usbhsg_ep_dequeue()
  usb: kconfig: fix warning of select USB_OTG
  usb: gadget: pxa27x: fix suspend callback
  usb: gadget: functionfs: fix missing access_ok checks
  usb: musb: USB_TI_CPPI41_DMA requires dmaengine support
parents f625cb8c f74875dc

drivers/usb/dwc2/platform.c

+53 −28
Original line number Diff line number Diff line
@@ -125,9 +125,11 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg) 
	if (ret)

		return ret;



	if (hsotg->clk) {

		ret = clk_prepare_enable(hsotg->clk);

		if (ret)

			return ret;

	}



	if (hsotg->uphy)

		ret = usb_phy_init(hsotg->uphy);
@@ -175,6 +177,7 @@ static int __dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) 
	if (ret)

		return ret;



	if (hsotg->clk)

		clk_disable_unprepare(hsotg->clk);



	ret = regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies),
@@ -212,14 +215,41 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) 
	 */

	hsotg->phy = devm_phy_get(hsotg->dev, "usb2-phy");

	if (IS_ERR(hsotg->phy)) {

		ret = PTR_ERR(hsotg->phy);

		switch (ret) {

		case -ENODEV:

		case -ENOSYS:

			hsotg->phy = NULL;

			break;

		case -EPROBE_DEFER:

			return ret;

		default:

			dev_err(hsotg->dev, "error getting phy %d\n", ret);

			return ret;

		}

	}



	if (!hsotg->phy) {

		hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2);

		if (IS_ERR(hsotg->uphy))

		if (IS_ERR(hsotg->uphy)) {

			ret = PTR_ERR(hsotg->uphy);

			switch (ret) {

			case -ENODEV:

			case -ENXIO:

				hsotg->uphy = NULL;

		else

			hsotg->plat = dev_get_platdata(hsotg->dev);

				break;

			case -EPROBE_DEFER:

				return ret;

			default:

				dev_err(hsotg->dev, "error getting usb phy %d\n",

					ret);

				return ret;

			}

		}

	}



	hsotg->plat = dev_get_platdata(hsotg->dev);



	if (hsotg->phy) {

		/*

		 * If using the generic PHY framework, check if the PHY bus
@@ -229,11 +259,6 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) 
			hsotg->phyif = GUSBCFG_PHYIF8;

	}



	if (!hsotg->phy && !hsotg->uphy && !hsotg->plat) {

		dev_err(hsotg->dev, "no platform data or transceiver defined\n");

		return -EPROBE_DEFER;

	}



	/* Clock */

	hsotg->clk = devm_clk_get(hsotg->dev, "otg");

	if (IS_ERR(hsotg->clk)) {
@@ -342,20 +367,6 @@ static int dwc2_driver_probe(struct platform_device *dev) 
	if (retval)

		return retval;



	irq = platform_get_irq(dev, 0);

	if (irq < 0) {

		dev_err(&dev->dev, "missing IRQ resource\n");

		return irq;

	}



	dev_dbg(hsotg->dev, "registering common handler for irq%d\n",

		irq);

	retval = devm_request_irq(hsotg->dev, irq,

				  dwc2_handle_common_intr, IRQF_SHARED,

				  dev_name(hsotg->dev), hsotg);

	if (retval)

		return retval;



	res = platform_get_resource(dev, IORESOURCE_MEM, 0);

	hsotg->regs = devm_ioremap_resource(&dev->dev, res);

	if (IS_ERR(hsotg->regs))
@@ -390,6 +401,20 @@ static int dwc2_driver_probe(struct platform_device *dev) 


	dwc2_set_all_params(hsotg->core_params, -1);



	irq = platform_get_irq(dev, 0);

	if (irq < 0) {

		dev_err(&dev->dev, "missing IRQ resource\n");

		return irq;

	}



	dev_dbg(hsotg->dev, "registering common handler for irq%d\n",

		irq);

	retval = devm_request_irq(hsotg->dev, irq,

				  dwc2_handle_common_intr, IRQF_SHARED,

				  dev_name(hsotg->dev), hsotg);

	if (retval)

		return retval;



	retval = dwc2_lowlevel_hw_enable(hsotg);

	if (retval)

		return retval;

drivers/usb/gadget/function/f_fs.c

+3 −3
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static ssize_t __ffs_ep0_read_events(struct ffs_data *ffs, char __user *buf, 
	spin_unlock_irq(&ffs->ev.waitq.lock);

	mutex_unlock(&ffs->mutex);



	return unlikely(__copy_to_user(buf, events, size)) ? -EFAULT : size;

	return unlikely(copy_to_user(buf, events, size)) ? -EFAULT : size;

}



static ssize_t ffs_ep0_read(struct file *file, char __user *buf,
@@ -513,7 +513,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf, 


		/* unlocks spinlock */

		ret = __ffs_ep0_queue_wait(ffs, data, len);

		if (likely(ret > 0) && unlikely(__copy_to_user(buf, data, len)))

		if (likely(ret > 0) && unlikely(copy_to_user(buf, data, len)))

			ret = -EFAULT;

		goto done_mutex;
@@ -3493,7 +3493,7 @@ static char *ffs_prepare_buffer(const char __user *buf, size_t len) 
	if (unlikely(!data))

		return ERR_PTR(-ENOMEM);



	if (unlikely(__copy_from_user(data, buf, len))) {

	if (unlikely(copy_from_user(data, buf, len))) {

		kfree(data);

		return ERR_PTR(-EFAULT);

	}

drivers/usb/gadget/function/f_midi.c

+2 −1
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt) 
		if (err) {

			ERROR(midi, "%s queue req: %d\n",

				    midi->out_ep->name, err);

			free_ep_req(midi->out_ep, req);

		}

	}
@@ -545,7 +546,7 @@ static void f_midi_transmit(struct f_midi *midi, struct usb_request *req) 
		}

	}



	if (req->length > 0) {

	if (req->length > 0 && ep->enabled) {

		int err;



		err = usb_ep_queue(ep, req, GFP_ATOMIC);

drivers/usb/gadget/udc/pxa27x_udc.c

+3 −0
Original line number Diff line number Diff line
@@ -2536,6 +2536,9 @@ static int pxa_udc_suspend(struct platform_device *_dev, pm_message_t state) 
	udc->pullup_resume = udc->pullup_on;

	dplus_pullup(udc, 0);



	if (udc->driver)

		udc->driver->disconnect(&udc->gadget);



	return 0;

}

drivers/usb/musb/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ config USB_TI_CPPI_DMA 


config USB_TI_CPPI41_DMA

	bool 'TI CPPI 4.1 (AM335x)'

	depends on ARCH_OMAP

	depends on ARCH_OMAP && DMADEVICES

	select TI_CPPI41



config USB_TUSB_OMAP_DMA

CRA Git | Maintained and supported by SUSTech CRA and CCSE