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

Commit 359334ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are number of small USB fixes for 5.3-rc5.

  Syzbot has been on a tear recently now that it has some good USB
  debugging hooks integrated, so there's a number of fixes in here found
  by those tools for some _very_ old bugs. Also a handful of gadget
  driver fixes for reported issues, some hopefully-final dma fixes for
  host controller drivers, and some new USB serial gadget driver ids.

  All of these have been in linux-next this week with no reported issues
  (the usb-serial ones were in linux-next in its own branch, but merged
  into mine on Friday)"

* tag 'usb-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: add a hcd_uses_dma helper
  usb: don't create dma pools for HCDs with a localmem_pool
  usb: chipidea: imx: fix EPROBE_DEFER support during driver probe
  usb: host: fotg2: restart hcd after port reset
  USB: CDC: fix sanity checks in CDC union parser
  usb: cdc-acm: make sure a refcount is taken early enough
  USB: serial: option: add the BroadMobi BM818 card
  USB: serial: option: Add Motorola modem UARTs
  USB: core: Fix races in character device registration and deregistraion
  usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt
  usb: gadget: composite: Clear "suspended" on reset/disconnect
  usb: gadget: udc: renesas_usb3: Fix sysfs interface of "role"
  USB: serial: option: add D-Link DWM-222 device ID
  USB: serial: option: Add support for ZTE MF871A
parents 8fde2832 6a5f43d1

drivers/usb/chipidea/ci_hdrc_imx.c

+12 −7
Original line number Diff line number Diff line
@@ -454,9 +454,11 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 
	imx_disable_unprepare_clks(dev);

disable_hsic_regulator:

	if (data->hsic_pad_regulator)

		ret = regulator_disable(data->hsic_pad_regulator);

		/* don't overwrite original ret (cf. EPROBE_DEFER) */

		regulator_disable(data->hsic_pad_regulator);

	if (pdata.flags & CI_HDRC_PMQOS)

		pm_qos_remove_request(&data->pm_qos_req);

	data->ci_pdev = NULL;

	return ret;

}
@@ -469,14 +471,17 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev) 
		pm_runtime_disable(&pdev->dev);

		pm_runtime_put_noidle(&pdev->dev);

	}

	if (data->ci_pdev)

		ci_hdrc_remove_device(data->ci_pdev);

	if (data->override_phy_control)

		usb_phy_shutdown(data->phy);

	if (data->ci_pdev) {

		imx_disable_unprepare_clks(&pdev->dev);

		if (data->plat_data->flags & CI_HDRC_PMQOS)

			pm_qos_remove_request(&data->pm_qos_req);

		if (data->hsic_pad_regulator)

			regulator_disable(data->hsic_pad_regulator);

	}



	return 0;

}

drivers/usb/class/cdc-acm.c

+7 −5
Original line number Diff line number Diff line
@@ -1301,10 +1301,6 @@ static int acm_probe(struct usb_interface *intf, 
	tty_port_init(&acm->port);

	acm->port.ops = &acm_port_ops;



	minor = acm_alloc_minor(acm);

	if (minor < 0)

		goto alloc_fail1;



	ctrlsize = usb_endpoint_maxp(epctrl);

	readsize = usb_endpoint_maxp(epread) *

				(quirks == SINGLE_RX_URB ? 1 : 2);
@@ -1312,6 +1308,13 @@ static int acm_probe(struct usb_interface *intf, 
	acm->writesize = usb_endpoint_maxp(epwrite) * 20;

	acm->control = control_interface;

	acm->data = data_interface;



	usb_get_intf(acm->control); /* undone in destruct() */



	minor = acm_alloc_minor(acm);

	if (minor < 0)

		goto alloc_fail1;



	acm->minor = minor;

	acm->dev = usb_dev;

	if (h.usb_cdc_acm_descriptor)
@@ -1458,7 +1461,6 @@ static int acm_probe(struct usb_interface *intf, 
	usb_driver_claim_interface(&acm_driver, data_interface, acm);

	usb_set_intfdata(data_interface, acm);



	usb_get_intf(control_interface);

	tty_dev = tty_port_register_device(&acm->port, acm_tty_driver, minor,

			&control_interface->dev);

	if (IS_ERR(tty_dev)) {

drivers/usb/core/buffer.c

+3 −7
Original line number Diff line number Diff line
@@ -66,9 +66,7 @@ int hcd_buffer_create(struct usb_hcd *hcd) 
	char		name[16];

	int		i, size;



	if (!IS_ENABLED(CONFIG_HAS_DMA) ||

	    (!is_device_dma_capable(hcd->self.sysdev) &&

	     !hcd->localmem_pool))

	if (hcd->localmem_pool || !hcd_uses_dma(hcd))

		return 0;



	for (i = 0; i < HCD_BUFFER_POOLS; i++) {
@@ -129,8 +127,7 @@ void *hcd_buffer_alloc( 
		return gen_pool_dma_alloc(hcd->localmem_pool, size, dma);



	/* some USB hosts just use PIO */

	if (!IS_ENABLED(CONFIG_HAS_DMA) ||

	    !is_device_dma_capable(bus->sysdev)) {

	if (!hcd_uses_dma(hcd)) {

		*dma = ~(dma_addr_t) 0;

		return kmalloc(size, mem_flags);

	}
@@ -160,8 +157,7 @@ void hcd_buffer_free( 
		return;

	}



	if (!IS_ENABLED(CONFIG_HAS_DMA) ||

	    !is_device_dma_capable(bus->sysdev)) {

	if (!hcd_uses_dma(hcd)) {

		kfree(addr);

		return;

	}

drivers/usb/core/file.c

+5 −5
Original line number Diff line number Diff line
@@ -193,9 +193,10 @@ int usb_register_dev(struct usb_interface *intf, 
		intf->minor = minor;

		break;

	}

	if (intf->minor < 0) {

		up_write(&minor_rwsem);

	if (intf->minor < 0)

		return -EXFULL;

	}



	/* create a usb class device for this usb interface */

	snprintf(name, sizeof(name), class_driver->name, minor - minor_base);
@@ -203,12 +204,11 @@ int usb_register_dev(struct usb_interface *intf, 
				      MKDEV(USB_MAJOR, minor), class_driver,

				      "%s", kbasename(name));

	if (IS_ERR(intf->usb_dev)) {

		down_write(&minor_rwsem);

		usb_minors[minor] = NULL;

		intf->minor = -1;

		up_write(&minor_rwsem);

		retval = PTR_ERR(intf->usb_dev);

	}

	up_write(&minor_rwsem);

	return retval;

}

EXPORT_SYMBOL_GPL(usb_register_dev);
@@ -234,12 +234,12 @@ void usb_deregister_dev(struct usb_interface *intf, 
		return;



	dev_dbg(&intf->dev, "removing %d minor\n", intf->minor);

	device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor));



	down_write(&minor_rwsem);

	usb_minors[intf->minor] = NULL;

	up_write(&minor_rwsem);



	device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor));

	intf->usb_dev = NULL;

	intf->minor = -1;

	destroy_usb_class();

drivers/usb/core/hcd.c

+2 −2
Original line number Diff line number Diff line
@@ -1412,7 +1412,7 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, 
	if (usb_endpoint_xfer_control(&urb->ep->desc)) {

		if (hcd->self.uses_pio_for_control)

			return ret;

		if (IS_ENABLED(CONFIG_HAS_DMA) && hcd->self.uses_dma) {

		if (hcd_uses_dma(hcd)) {

			if (is_vmalloc_addr(urb->setup_packet)) {

				WARN_ONCE(1, "setup packet is not dma capable\n");

				return -EAGAIN;
@@ -1446,7 +1446,7 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, 
	dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;

	if (urb->transfer_buffer_length != 0

	    && !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP)) {

		if (IS_ENABLED(CONFIG_HAS_DMA) && hcd->self.uses_dma) {

		if (hcd_uses_dma(hcd)) {

			if (urb->num_sgs) {

				int n;