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

Commit e4049eb8 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)
  USB: sl811-hcd: Fix device disconnect
  USB: ohci-at91: fix power management hanging
  USB: rename usb_buffer_alloc() and usb_buffer_free()
  USB: ti_usb: fix printk format warning
  USB: gadget: s3c-hsotg: Add missing unlock
  USB: fix build on OMAPs if CONFIG_PM_RUNTIME is not set
  USB: oxu210hp: release spinlock on error path
  USB: serial: option: add cinterion device id
  USB: serial: option: ZTEAC8710 Support with Device ID 0xffff
  USB: serial: pl2303: Hybrid reader Uniform HCR331
  USB: option: add ID for ZTE MF 330
  USB: xhci: properly set endpoint context fields for periodic eps.
  USB: xhci: properly set the "Mult" field of the endpoint context.
  USB: OHCI: don't look at the root hub to get the number of ports
  USB: don't choose configs with no interfaces
  USB: cdc-acm: add another device quirk
  USB: fix testing the wrong variable in fs_create_by_name()
  usb: Fix tusb6010 for DMA API
  musb_core: fix musb_init_controller() error cleanup path
  MUSB: fix DaVinci glue layer dependency
  ...
parents 35d824b2 8a3461e2

arch/arm/plat-omap/include/plat/usb.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct ehci_hcd_omap_platform_data { 
struct omap_musb_board_data {

	u8	interface_type;

	u8	mode;

	u8	power;

	u16	power;

};



enum musb_interface    {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI};

drivers/usb/class/cdc-acm.c

+3 −0
Original line number Diff line number Diff line
@@ -1542,6 +1542,9 @@ static const struct usb_device_id acm_ids[] = { 
	{ USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */

	.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */

	},

	{ USB_DEVICE(0x1576, 0x03b1), /* Maretron USB100 */

	.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */

	},



	/* Nokia S60 phones expose two ACM channels. The first is

	 * a modem and is picked up by the standard AT-command

drivers/usb/core/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ config USB_SUSPEND 
config USB_OTG

	bool

	depends on USB && EXPERIMENTAL

	select USB_SUSPEND

	depends on USB_SUSPEND

	default n

drivers/usb/core/generic.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int usb_choose_configuration(struct usb_device *udev) 
		 * than a vendor-specific driver. */

		else if (udev->descriptor.bDeviceClass !=

						USB_CLASS_VENDOR_SPEC &&

				(!desc || desc->bInterfaceClass !=

				(desc && desc->bInterfaceClass !=

						USB_CLASS_VENDOR_SPEC)) {

			best = c;

			break;

drivers/usb/core/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -515,13 +515,13 @@ static int fs_create_by_name (const char *name, mode_t mode, 
	*dentry = NULL;

	mutex_lock(&parent->d_inode->i_mutex);

	*dentry = lookup_one_len(name, parent, strlen(name));

	if (!IS_ERR(dentry)) {

	if (!IS_ERR(*dentry)) {

		if ((mode & S_IFMT) == S_IFDIR)

			error = usbfs_mkdir (parent->d_inode, *dentry, mode);

		else 

			error = usbfs_create (parent->d_inode, *dentry, mode);

	} else

		error = PTR_ERR(dentry);

		error = PTR_ERR(*dentry);

	mutex_unlock(&parent->d_inode->i_mutex);



	return error;