Commit fe3e5bc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB driver fixes from Greg KH:
 "Here are some small USB driver fixes for 7.1-rc3 to resolve some
  reported issues, and a new device id. These are:

   - usblp driver heap leak fixes

   - ulpi driver memory leak fix

   - typec driver fixes

   - dwc3 driver fix

   - omap dma driver fix

   - new option driver device id addition

  All of these have been in linux-next for over a week with no reported
  issues"

* tag 'usb-7.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: serial: option: add Telit Cinterion LE910Cx compositions
  usb: usblp: fix uninitialized heap leak via LPGETSTATUS ioctl
  usb: usblp: fix heap leak in IEEE 1284 device ID via short response
  usb: dwc3: Move GUID programming after PHY initialization
  usb: typec: tcpm: fix debug accessory mode detection for sink ports
  usb: typec: tcpm: reset internal port states on soft reset AMS
  usb: ulpi: fix memory leak on ulpi_register() error paths
  USB: omap_udc: DMA: Don't enable burst 4 mode
parents 656a95c4 4fd44d47

drivers/usb/class/usblp.c

+2 −1
Original line number Diff line number Diff line
@@ -1178,7 +1178,7 @@ static int usblp_probe(struct usb_interface *intf, 
	}



	/* Allocate buffer for printer status */

	usblp->statusbuf = kmalloc(STATUS_BUF_SIZE, GFP_KERNEL);

	usblp->statusbuf = kzalloc(STATUS_BUF_SIZE, GFP_KERNEL);

	if (!usblp->statusbuf) {

		retval = -ENOMEM;

		goto abort;
@@ -1377,6 +1377,7 @@ static int usblp_cache_device_id_string(struct usblp *usblp) 
{

	int err, length;



	memset(usblp->device_id_string, 0, USBLP_DEVICE_ID_SIZE);

	err = usblp_get_id(usblp, 0, usblp->device_id_string, USBLP_DEVICE_ID_SIZE - 1);

	if (err < 0) {

		dev_dbg(&usblp->intf->dev,

drivers/usb/common/ulpi.c

+4 −1
Original line number Diff line number Diff line
@@ -286,12 +286,15 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi) 
	ACPI_COMPANION_SET(&ulpi->dev, ACPI_COMPANION(dev));



	ret = ulpi_of_register(ulpi);

	if (ret)

	if (ret) {

		kfree(ulpi);

		return ret;

	}



	ret = ulpi_read_id(ulpi);

	if (ret) {

		of_node_put(ulpi->dev.of_node);

		kfree(ulpi);

		return ret;

	}

drivers/usb/dwc3/core.c

+6 −6
Original line number Diff line number Diff line
@@ -1359,12 +1359,6 @@ int dwc3_core_init(struct dwc3 *dwc) 


	hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0);



	/*

	 * Write Linux Version Code to our GUID register so it's easy to figure

	 * out which kernel version a bug was found.

	 */

	dwc3_writel(dwc, DWC3_GUID, LINUX_VERSION_CODE);



	ret = dwc3_phy_setup(dwc);

	if (ret)

		return ret;
@@ -1398,6 +1392,12 @@ int dwc3_core_init(struct dwc3 *dwc) 
	if (ret)

		goto err_exit_phy;



	/*

	 * Write Linux Version Code to our GUID register so it's easy to figure

	 * out which kernel version a bug was found.

	 */

	dwc3_writel(dwc, DWC3_GUID, LINUX_VERSION_CODE);



	dwc3_core_setup_global_control(dwc);

	dwc3_core_num_eps(dwc);

drivers/usb/gadget/udc/omap_udc.c

+0 −4
Original line number Diff line number Diff line
@@ -733,8 +733,6 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel) 
		if (status == 0) {

			omap_writew(reg, UDC_TXDMA_CFG);

			/* EMIFF or SDRC */

			omap_set_dma_src_burst_mode(ep->lch,

						OMAP_DMA_DATA_BURST_4);

			omap_set_dma_src_data_pack(ep->lch, 1);

			/* TIPB */

			omap_set_dma_dest_params(ep->lch,
@@ -756,8 +754,6 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel) 
				UDC_DATA_DMA,

				0, 0);

			/* EMIFF or SDRC */

			omap_set_dma_dest_burst_mode(ep->lch,

						OMAP_DMA_DATA_BURST_4);

			omap_set_dma_dest_data_pack(ep->lch, 1);

		}

	}

drivers/usb/serial/option.c

+4 −0
Original line number Diff line number Diff line
@@ -1513,7 +1513,11 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1231, 0xff),	/* Telit LE910Cx (RNDIS) */

	  .driver_info = NCTRL(2) | RSVD(3) },

	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x1250, 0xff, 0x00, 0x00) },	/* Telit LE910Cx (rmnet) */

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1251, 0xff) },	/* Telit LE910Cx (RNDIS) */

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1252, 0xff) },	/* Telit LE910Cx (MBIM) */

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1253, 0xff) },	/* Telit LE910Cx (ECM) */

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1254, 0xff) },	/* Telit LE910Cx */

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1255, 0xff) },	/* Telit LE910Cx */

	{ USB_DEVICE(TELIT_VENDOR_ID, 0x1260),

	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },

	{ USB_DEVICE(TELIT_VENDOR_ID, 0x1261),