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

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

Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (21 commits)
  usb: ftdi_sio: add PID for Propox ISPcable III
  Revert "xHCI: reset-on-resume quirk for NEC uPD720200"
  xHCI: fix bug in xhci_clear_command_ring()
  usb: gadget: fsl_udc: fix dequeuing a request in progress
  usb: fsl_mxc_udc.c: Remove compile-time dependency of MX35 SoC type
  usb: fsl_mxc_udc.c: Fix build issue by including missing header file
  USB: fsl_udc_core: use usb_endpoint_xfer_isoc to judge ISO XFER
  usb: udc: Fix gadget driver's speed check in various UDC drivers
  usb: gadget: fix g_serial regression
  usb: renesas_usbhs: fixup driver speed
  usb: renesas_usbhs: fixup gadget.dev.driver when udc_stop.
  usb: renesas_usbhs: fixup signal the driver that cable was disconnected
  usb: renesas_usbhs: fixup device_register timing
  usb: musb: PM: fix context save/restore in suspend/resume path
  USB: linux-cdc-acm.inf: add support for the acm_ms gadget
  EHCI : Fix a regression in the ISO scheduler
  xHCI: reset-on-resume quirk for NEC uPD720200
  USB: whci-hcd: fix endian conversion in qset_clear()
  USB: usb-storage: unusual_devs entry for Kingston DT 101 G2
  usb: option: add SIMCom SIM5218
  ...
parents f9143eae 8593b6f6

Documentation/usb/linux-cdc-acm.inf

+2 −2
Original line number Original line Diff line number Diff line
@@ -90,10 +90,10 @@ ServiceBinary=%12%\USBSER.sys 
[SourceDisksFiles]

[SourceDisksFiles]

[SourceDisksNames]

[SourceDisksNames]

[DeviceList]

[DeviceList]

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02, USB\VID_1D6B&PID_0106&MI_00





[DeviceList.NTamd64]

[DeviceList.NTamd64]

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02, USB\VID_1D6B&PID_0106&MI_00









;------------------------------------------------------------------------------

;------------------------------------------------------------------------------

drivers/usb/gadget/amd5536udc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1959,7 +1959,7 @@ static int amd5536_start(struct usb_gadget_driver *driver, 
	u32 tmp;

	u32 tmp;





	if (!driver || !bind || !driver->setup

	if (!driver || !bind || !driver->setup

			|| driver->speed != USB_SPEED_HIGH)

			|| driver->speed < USB_SPEED_HIGH)

		return -EINVAL;

		return -EINVAL;

	if (!dev)

	if (!dev)

		return -ENODEV;

		return -ENODEV;

drivers/usb/gadget/f_serial.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -131,8 +131,8 @@ static int gser_set_alt(struct usb_function *f, unsigned intf, unsigned alt) 
	}

	}

	if (!gser->port.in->desc || !gser->port.out->desc) {

	if (!gser->port.in->desc || !gser->port.out->desc) {

		DBG(cdev, "activate generic ttyGS%d\n", gser->port_num);

		DBG(cdev, "activate generic ttyGS%d\n", gser->port_num);

		if (!config_ep_by_speed(cdev->gadget, f, gser->port.in) ||

		if (config_ep_by_speed(cdev->gadget, f, gser->port.in) ||

		    !config_ep_by_speed(cdev->gadget, f, gser->port.out)) {

		    config_ep_by_speed(cdev->gadget, f, gser->port.out)) {

			gser->port.in->desc = NULL;

			gser->port.in->desc = NULL;

			gser->port.out->desc = NULL;

			gser->port.out->desc = NULL;

			return -EINVAL;

			return -EINVAL;

drivers/usb/gadget/fsl_mxc_udc.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/err.h>

#include <linux/err.h>

#include <linux/fsl_devices.h>

#include <linux/fsl_devices.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/io.h>





#include <mach/hardware.h>

#include <mach/hardware.h>
@@ -88,7 +89,6 @@ int fsl_udc_clk_init(struct platform_device *pdev) 
void fsl_udc_clk_finalize(struct platform_device *pdev)

void fsl_udc_clk_finalize(struct platform_device *pdev)

{

{

	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;

	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;

#if defined(CONFIG_SOC_IMX35)

	if (cpu_is_mx35()) {

	if (cpu_is_mx35()) {

		unsigned int v;

		unsigned int v;
@@ -101,7 +101,6 @@ void fsl_udc_clk_finalize(struct platform_device *pdev) 
					USBPHYCTRL_OTGBASE_OFFSET));

					USBPHYCTRL_OTGBASE_OFFSET));

		}

		}

	}

	}

#endif





	/* ULPI transceivers don't need usbpll */

	/* ULPI transceivers don't need usbpll */

	if (pdata->phy_mode == FSL_USB2_PHY_ULPI) {

	if (pdata->phy_mode == FSL_USB2_PHY_ULPI) {

drivers/usb/gadget/fsl_qe_udc.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -2336,8 +2336,7 @@ static int fsl_qe_start(struct usb_gadget_driver *driver, 
	if (!udc_controller)

	if (!udc_controller)

		return -ENODEV;

		return -ENODEV;





	if (!driver || (driver->speed != USB_SPEED_FULL

	if (!driver || driver->speed < USB_SPEED_FULL

			&& driver->speed != USB_SPEED_HIGH)

			|| !bind || !driver->disconnect || !driver->setup)

			|| !bind || !driver->disconnect || !driver->setup)

		return -EINVAL;

		return -EINVAL;