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

Commit c6ad1217 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-2.6 

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  Revert "USB: Reset USB 3.0 devices on (re)discovery"
  USB: musb: omap2430: fix kernel panic on reboot
  sierra: add new ID for Airprime/Sierra USB IP modem
  USB: serial/usb_wwan, fix tty NULL dereference
  USB: Reset USB 3.0 devices on (re)discovery
  USB: Add quirk for Samsung Android phone modem
  USB: Add Samsung SGH-I500/Android modem ID switch to visor driver
  USB: add quirks entry for Keytouch QWERTY Panel
  usb: musb: omap2430: fix kernel panic on reboot
  usb: musb: fix build breakage
parents d8204a37 9ce4f80f

drivers/usb/core/quirks.c

+8 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ static const struct usb_device_id usb_quirk_list[] = { 
	{ USB_DEVICE(0x04b4, 0x0526), .driver_info =

			USB_QUIRK_CONFIG_INTF_STRINGS },



	/* Samsung Android phone modem - ID conflict with SPH-I500 */

	{ USB_DEVICE(0x04e8, 0x6601), .driver_info =

			USB_QUIRK_CONFIG_INTF_STRINGS },



	/* Roland SC-8820 */

	{ USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },
@@ -68,6 +72,10 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* M-Systems Flash Disk Pioneers */

	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Keytouch QWERTY Panel keyboard */

	{ USB_DEVICE(0x0926, 0x3333), .driver_info =

			USB_QUIRK_CONFIG_INTF_STRINGS },



	/* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */

	{ USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },

drivers/usb/musb/musb_core.h

+9 −8
Original line number Diff line number Diff line
@@ -488,6 +488,15 @@ struct musb { 
	unsigned		set_address:1;

	unsigned		test_mode:1;

	unsigned		softconnect:1;



	u8			address;

	u8			test_mode_nr;

	u16			ackpend;		/* ep0 */

	enum musb_g_ep0_state	ep0_state;

	struct usb_gadget	g;			/* the gadget */

	struct usb_gadget_driver *gadget_driver;	/* its driver */

#endif



	/*

	 * FIXME: Remove this flag.

	 *
@@ -501,14 +510,6 @@ struct musb { 
	 */

	unsigned                double_buffer_not_ok:1 __deprecated;



	u8			address;

	u8			test_mode_nr;

	u16			ackpend;		/* ep0 */

	enum musb_g_ep0_state	ep0_state;

	struct usb_gadget	g;			/* the gadget */

	struct usb_gadget_driver *gadget_driver;	/* its driver */

#endif



	struct musb_hdrc_config	*config;



#ifdef MUSB_CONFIG_PROC_FS

drivers/usb/musb/omap2430.c

+1 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ static int omap2430_musb_init(struct musb *musb) 


static int omap2430_musb_exit(struct musb *musb)

{

	del_timer_sync(&musb_idle_timer);



	omap2430_low_level_exit(musb);

	otg_put_transceiver(musb->xceiv);

drivers/usb/serial/sierra.c

+3 −0
Original line number Diff line number Diff line
@@ -301,6 +301,9 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x1199, 0x68A3), 	/* Sierra Wireless Direct IP modems */

	  .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist

	},

	{ USB_DEVICE(0x0f3d, 0x68A3), 	/* Airprime/Sierra Wireless Direct IP modems */

	  .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist

	},

       { USB_DEVICE(0x413C, 0x08133) }, /* Dell Computer Corp. Wireless 5720 VZW Mobile Broadband (EVDO Rev-A) Minicard GPS Port */



	{ }

drivers/usb/serial/usb_wwan.c

+9 −6
Original line number Diff line number Diff line
@@ -295,12 +295,15 @@ static void usb_wwan_indat_callback(struct urb *urb) 
		    __func__, status, endpoint);

	} else {

		tty = tty_port_tty_get(&port->port);

		if (tty) {

			if (urb->actual_length) {

			tty_insert_flip_string(tty, data, urb->actual_length);

				tty_insert_flip_string(tty, data,

						urb->actual_length);

				tty_flip_buffer_push(tty);

			} else

				dbg("%s: empty read urb received", __func__);

			tty_kref_put(tty);

		}



		/* Resubmit urb so we continue receiving */

		if (status != -ESHUTDOWN) {