Commit 1cd653a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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



Pull USB fixes from Greg Kroah-Hartman:
 "Here are a number of tiny USB fixes for 3.4-rc4.

  Most of them are in the USB gadget area, but a few other minor USB
  driver and core fixes are here as well.

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'usb-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (36 commits)
  USB: serial: cp210x: Fixed usb_control_msg timeout values
  USB: ehci-tegra: don't call set_irq_flags(IRQF_VALID)
  USB: yurex: Fix missing URB_NO_TRANSFER_DMA_MAP flag in urb
  USB: yurex: Remove allocation of coherent buffer for setup-packet buffer
  drivers/usb/misc/usbtest.c: add kfrees
  USB: ehci-fsl: Fix kernel crash on mpc5121e
  uwb: fix error handling
  uwb: fix use of del_timer_sync() in interrupt
  EHCI: always clear the STS_FLR status bit
  EHCI: fix criterion for resuming the root hub
  USB: sierra: avoid QMI/wwan interface on MC77xx
  usb: usbtest: avoid integer overflow in alloc_sglist()
  usb: usbtest: avoid integer overflow in test_ctrl_queue()
  USB: fix deadlock in bConfigurationValue attribute method
  usb: gadget: eliminate NULL pointer dereference (bugfix)
  usb: gadget: uvc: Remove non-required locking from 'uvc_queue_next_buffer' routine
  usb: gadget: rndis: fix Missing req->context assignment
  usb: musb: omap: fix the error check for pm_runtime_get_sync
  usb: gadget: udc-core: fix asymmetric calls in remove_driver
  usb: musb: omap: fix crash when musb glue (omap) gets initialized
  ...
parents c1acb0ba 2d5733fc

drivers/usb/core/hub.c

+0 −3
Original line number Diff line number Diff line
@@ -1667,7 +1667,6 @@ void usb_disconnect(struct usb_device **pdev) 
{

	struct usb_device	*udev = *pdev;

	int			i;

	struct usb_hcd		*hcd = bus_to_hcd(udev->bus);



	/* mark the device as inactive, so any further urb submissions for

	 * this device (and any of its children) will fail immediately.
@@ -1690,9 +1689,7 @@ void usb_disconnect(struct usb_device **pdev) 
	 * so that the hardware is now fully quiesced.

	 */

	dev_dbg (&udev->dev, "unregistering device\n");

	mutex_lock(hcd->bandwidth_mutex);

	usb_disable_device(udev, 0);

	mutex_unlock(hcd->bandwidth_mutex);

	usb_hcd_synchronize_unlinks(udev);



	usb_remove_ep_devs(&udev->ep0);

drivers/usb/core/message.c

+3 −3
Original line number Diff line number Diff line
@@ -1136,8 +1136,6 @@ void usb_disable_interface(struct usb_device *dev, struct usb_interface *intf, 
 * Deallocates hcd/hardware state for the endpoints (nuking all or most

 * pending urbs) and usbcore state for the interfaces, so that usbcore

 * must usb_set_configuration() before any interfaces could be used.

 *

 * Must be called with hcd->bandwidth_mutex held.

 */

void usb_disable_device(struct usb_device *dev, int skip_ep0)

{
@@ -1190,7 +1188,9 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) 
			usb_disable_endpoint(dev, i + USB_DIR_IN, false);

		}

		/* Remove endpoints from the host controller internal state */

		mutex_lock(hcd->bandwidth_mutex);

		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);

		mutex_unlock(hcd->bandwidth_mutex);

		/* Second pass: remove endpoint pointers */

	}

	for (i = skip_ep0; i < 16; ++i) {
@@ -1750,7 +1750,6 @@ free_interfaces: 
	/* if it's already configured, clear out old state first.

	 * getting rid of old interfaces means unbinding their drivers.

	 */

	mutex_lock(hcd->bandwidth_mutex);

	if (dev->state != USB_STATE_ADDRESS)

		usb_disable_device(dev, 1);	/* Skip ep0 */
@@ -1763,6 +1762,7 @@ free_interfaces: 
	 * host controller will not allow submissions to dropped endpoints.  If

	 * this call fails, the device state is unchanged.

	 */

	mutex_lock(hcd->bandwidth_mutex);

	ret = usb_hcd_alloc_bandwidth(dev, cp, NULL, NULL);

	if (ret < 0) {

		mutex_unlock(hcd->bandwidth_mutex);

drivers/usb/dwc3/core.c

+3 −3
Original line number Diff line number Diff line
@@ -206,11 +206,11 @@ static void dwc3_free_event_buffers(struct dwc3 *dwc) 


	for (i = 0; i < dwc->num_event_buffers; i++) {

		evt = dwc->ev_buffs[i];

		if (evt) {

		if (evt)

			dwc3_free_one_event_buffer(dwc, evt);

			dwc->ev_buffs[i] = NULL;

		}

	}



	kfree(dwc->ev_buffs);

}



/**

drivers/usb/dwc3/ep0.c

+10 −2
Original line number Diff line number Diff line
@@ -353,6 +353,9 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc, 


			dwc->test_mode_nr = wIndex >> 8;

			dwc->test_mode = true;

			break;

		default:

			return -EINVAL;

		}

		break;
@@ -559,15 +562,20 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc, 
	length = trb->size & DWC3_TRB_SIZE_MASK;



	if (dwc->ep0_bounced) {

		unsigned transfer_size = ur->length;

		unsigned maxp = ep0->endpoint.maxpacket;



		transfer_size += (maxp - (transfer_size % maxp));

		transferred = min_t(u32, ur->length,

				ep0->endpoint.maxpacket - length);

				transfer_size - length);

		memcpy(ur->buf, dwc->ep0_bounce, transferred);

		dwc->ep0_bounced = false;

	} else {

		transferred = ur->length - length;

		ur->actual += transferred;

	}



	ur->actual += transferred;



	if ((epnum & 1) && ur->actual < ur->length) {

		/* for some reason we did not get everything out */

drivers/usb/gadget/f_fs.c

+2 −1
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ static long ffs_ep0_ioctl(struct file *file, unsigned code, unsigned long value) 
	if (code == FUNCTIONFS_INTERFACE_REVMAP) {

		struct ffs_function *func = ffs->func;

		ret = func ? ffs_func_revmap_intf(func, value) : -ENODEV;

	} else if (gadget->ops->ioctl) {

	} else if (gadget && gadget->ops->ioctl) {

		ret = gadget->ops->ioctl(gadget, code, value);

	} else {

		ret = -ENOTTY;
@@ -1382,6 +1382,7 @@ static void functionfs_unbind(struct ffs_data *ffs) 
		ffs->ep0req = NULL;

		ffs->gadget = NULL;

		ffs_data_put(ffs);

		clear_bit(FFS_FL_BOUND, &ffs->flags);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE