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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (29 commits)
  ARM: imx: fix build failure concerning otg/ulpi
  USB: ftdi_sio: add product ID for Lenz LI-USB
  USB: adutux: fix misuse of return value of copy_to_user()
  USB: iowarrior: fix misuse of return value of copy_to_user()
  USB: xHCI: update ring dequeue pointer when process missed tds
  USB: xhci: Remove buggy assignment in next_trb()
  USB: ftdi_sio: Add ID for Ionics PlugComputer
  USB: serial: io_ti.c: don't return 0 if writing the download record failed
  USB: otg: twl4030: fix wrong assumption of starting state
  USB: gadget: Return -ENOMEM on memory allocation failure
  USB: gadget: fix composite kernel-doc warnings
  USB: ssu100: set tty_flags in ssu100_process_packet
  USB: ssu100: add disconnect function for ssu100
  USB: serial: export symbol usb_serial_generic_disconnect
  USB: ssu100: rework logic for TIOCMIWAIT
  USB: ssu100: add register parameter to ssu100_setregister
  USB: ssu100: remove duplicate #defines in ssu100
  USB: ssu100: refine process_packet in ssu100
  USB: ssu100: add locking for port private data in ssu100
  USB: r8a66597-udc: return -ENOMEM if kzalloc() fails
  ...
parents d1b113bb 70ddd47f

arch/arm/mach-imx/mach-cpuimx27.c

+2 −2
Original line number Diff line number Diff line
@@ -279,13 +279,13 @@ static void __init eukrea_cpuimx27_init(void) 
#if defined(CONFIG_USB_ULPI)

	if (otg_mode_host) {

		otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



		mxc_register_device(&mxc_otg_host, &otg_pdata);

	}



	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

#endif

arch/arm/mach-imx/mach-pca100.c

+2 −2
Original line number Diff line number Diff line
@@ -419,13 +419,13 @@ static void __init pca100_init(void) 
#if defined(CONFIG_USB_ULPI)

	if (otg_mode_host) {

		otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



		mxc_register_device(&mxc_otg_host, &otg_pdata);

	}



	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

#endif

arch/arm/mach-mx25/mach-cpuimx25.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void __init eukrea_cpuimx25_init(void) 
#if defined(CONFIG_USB_ULPI)

	if (otg_mode_host) {

		otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



		mxc_register_device(&mxc_otg, &otg_pdata);

	}

arch/arm/mach-mx3/mach-cpuimx35.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static void __init mxc_board_init(void) 
#if defined(CONFIG_USB_ULPI)

	if (otg_mode_host) {

		otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



		mxc_register_device(&mxc_otg_host, &otg_pdata);

	}

drivers/usb/gadget/composite.c

+2 −2
Original line number Diff line number Diff line
@@ -723,12 +723,12 @@ int usb_string_ids_tab(struct usb_composite_dev *cdev, struct usb_string *str) 


/**

 * usb_string_ids_n() - allocate unused string IDs in batch

 * @cdev: the device whose string descriptor IDs are being allocated

 * @c: the device whose string descriptor IDs are being allocated

 * @n: number of string IDs to allocate

 * Context: single threaded during gadget setup

 *

 * Returns the first requested ID.  This ID and next @n-1 IDs are now

 * valid IDs.  At least providind that @n is non zore because if it

 * valid IDs.  At least provided that @n is non-zero because if it

 * is, returns last requested ID which is now very useful information.

 *

 * @usb_string_ids_n() is called from bind() callbacks to allocate