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

Commit 3c4f1158 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: (21 commits)
  USB: musb: fix srp sysfs entry deletion
  USB: musb: resume suspended root hub on disconnect
  USB: musb: use right poll limit for low speed devices
  USB: musb: be careful with 64K+ transfer lengths, host side
  USB: musb: fix data toggle saving with shared FIFO
  USB: musb: host endpoint_disable() oops fixes
  USB: musb: fix urb_dequeue() method
  USB: musb: fix musb_host_tx() for shared endpoint FIFO
  USB: musb: be careful with 64K+ transfer lengths (gadget side)
  usb: musb: make Davinci *work* in mainline
  USB: usb_get_string should check the descriptor type
  USB: gadget: fix build error in omap_apollon_2420_defconfig
  USB: g_file_storage: automatically disable stalls under Atmel
  USB: usb-storage: add IGNORE_RESIDUE flag for Genesys Logic adapters
  USB: Quirk for Hummingbird huc56s / Conexant ACM modem
  USB: serial: add support for second revision of Ericsson F3507G WWAN card
  USB: cdc-acm: add usb id for motomagx phones
  USB: option: add BenQ 3g modem information
  usb: gadget: obex: select correct ep descriptors
  USB: EHCI: slow down ITD reuse
  ...
parents 7187adbf e7479512

arch/arm/mach-davinci/board-evm.c

+3 −3
Original line number Diff line number Diff line
@@ -311,6 +311,9 @@ evm_u35_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c) 
	gpio_request(gpio + 7, "nCF_SEL");

	gpio_direction_output(gpio + 7, 1);



	/* irlml6401 sustains over 3A, switches 5V in under 8 msec */

	setup_usb(500, 8);



	return 0;

}
@@ -417,9 +420,6 @@ static __init void davinci_evm_init(void) 
	platform_add_devices(davinci_evm_devices,

			     ARRAY_SIZE(davinci_evm_devices));

	evm_init_i2c();



	/* irlml6401 sustains over 3A, switches 5V in under 8 msec */

	setup_usb(500, 8);

}



static __init void davinci_evm_irq_init(void)

arch/arm/mach-davinci/clock.c

+5 −0
Original line number Diff line number Diff line
@@ -230,6 +230,11 @@ static struct clk davinci_clks[] = { 
		.rate = &commonrate,

		.lpsc = DAVINCI_LPSC_GPIO,

	},

	{

		.name = "usb",

		.rate = &commonrate,

		.lpsc = DAVINCI_LPSC_USB,

	},

	{

		.name = "AEMIFCLK",

		.rate = &commonrate,

arch/arm/mach-davinci/usb.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static struct musb_hdrc_platform_data usb_data = { 
#elif defined(CONFIG_USB_MUSB_HOST)

	.mode           = MUSB_HOST,

#endif

	.clock		= "usb",

	.config		= &musb_config,

};

drivers/usb/class/cdc-acm.c

+9 −0
Original line number Diff line number Diff line
@@ -1376,6 +1376,15 @@ static struct usb_device_id acm_ids[] = { 
	{ USB_DEVICE(0x0572, 0x1324), /* Conexant USB MODEM RD02-D400 */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */

	},

	{ USB_DEVICE(0x0572, 0x1329), /* Hummingbird huc56s (Conexant) */

	.driver_info = NO_UNION_NORMAL, /* union descriptor misplaced on

					   data interface instead of

					   communications interface.

					   Maybe we should define a new

					   quirk for this. */

	},



	/* control interfaces with various AT-command sets */

	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,

drivers/usb/core/message.c

+8 −3
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ int usb_get_descriptor(struct usb_device *dev, unsigned char type, 
		if (result <= 0 && result != -ETIMEDOUT)

			continue;

		if (result > 1 && ((u8 *)buf)[1] != type) {

			result = -EPROTO;

			result = -ENODATA;

			continue;

		}

		break;
@@ -696,7 +696,12 @@ static int usb_get_string(struct usb_device *dev, unsigned short langid, 
			USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,

			(USB_DT_STRING << 8) + index, langid, buf, size,

			USB_CTRL_GET_TIMEOUT);

		if (!(result == 0 || result == -EPIPE))

		if (result == 0 || result == -EPIPE)

			continue;

		if (result > 1 && ((u8 *) buf)[1] != USB_DT_STRING) {

			result = -ENODATA;

			continue;

		}

		break;

	}

	return result;