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

Commit aaa594cd 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:
  USB: New device ID for the CP2101 driver
  USB: VID/PID update for sierra
  USB: Unbreak fsl_usb2_udc
parents 2634d064 014840ec

drivers/usb/gadget/fsl_usb2_udc.c

+1 −1
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ static void setup_received_irq(struct fsl_udc *udc, 
				| USB_TYPE_STANDARD)) {

			/* Note: The driver has not include OTG support yet.

			 * This will be set when OTG support is added */

			if (!gadget_is_otg(udc->gadget))

			if (!gadget_is_otg(&udc->gadget))

				break;

			else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE)

				udc->gadget.b_hnp_enable = 1;

drivers/usb/serial/cp2101.c

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ static int debug; 
static struct usb_device_id id_table [] = {

	{ USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */

	{ USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */

	{ USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */

	{ USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */

	{ USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */

	{ USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */

drivers/usb/serial/sierra.c

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static struct usb_device_id id_table [] = { 
	{ USB_DEVICE(0x1199, 0x6804) },	/* Sierra Wireless MC8755 */

	{ USB_DEVICE(0x1199, 0x6803) },	/* Sierra Wireless MC8765 */

	{ USB_DEVICE(0x1199, 0x6812) },	/* Sierra Wireless MC8775 & AC 875U */

	{ USB_DEVICE(0x1199, 0x6813) },	/* Sierra Wireless MC8775 (Thinkpad internal) */

	{ USB_DEVICE(0x1199, 0x6820) },	/* Sierra Wireless AirCard 875 */

	{ USB_DEVICE(0x1199, 0x6832) },	/* Sierra Wireless MC8780*/

	{ USB_DEVICE(0x1199, 0x6833) },	/* Sierra Wireless MC8781*/
@@ -146,6 +147,7 @@ static struct usb_device_id id_table_3port [] = { 
	{ USB_DEVICE(0x1199, 0x6804) },	/* Sierra Wireless MC8755 */

	{ USB_DEVICE(0x1199, 0x6803) },	/* Sierra Wireless MC8765 */

	{ USB_DEVICE(0x1199, 0x6812) },	/* Sierra Wireless MC8775 & AC 875U */

	{ USB_DEVICE(0x1199, 0x6813) },	/* Sierra Wireless MC8775 (Thinkpad internal) */

	{ USB_DEVICE(0x1199, 0x6820) },	/* Sierra Wireless AirCard 875 */

	{ USB_DEVICE(0x1199, 0x6832) },	/* Sierra Wireless MC8780*/

	{ USB_DEVICE(0x1199, 0x6833) },	/* Sierra Wireless MC8781*/