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

Commit f242bbc5 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 

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: option: Removing one bogus and adding some new Huawei combinations
  USB: cdc-acm: add IDs for Motorola H24 HSPA USB module.
  usb: option: Add Huawei E398 controlling interfaces
  usb: renesas_usbhs: add hcd->has_tt for low/full speed
  usb: renesas_usbhs: typofix: irq_dtch control DTCHE
  usb: gadget: storage: release superspeed descriptors.
parents ddf5a25c 02a551c9

drivers/usb/class/cdc-acm.c

+10 −0
Original line number Diff line number Diff line
@@ -1458,6 +1458,16 @@ static const struct usb_device_id acm_ids[] = { 
	},

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

	},

	/* Motorola H24 HSPA module: */

	{ USB_DEVICE(0x22b8, 0x2d91) }, /* modem                                */

	{ USB_DEVICE(0x22b8, 0x2d92) }, /* modem           + diagnostics        */

	{ USB_DEVICE(0x22b8, 0x2d93) }, /* modem + AT port                      */

	{ USB_DEVICE(0x22b8, 0x2d95) }, /* modem + AT port + diagnostics        */

	{ USB_DEVICE(0x22b8, 0x2d96) }, /* modem                         + NMEA */

	{ USB_DEVICE(0x22b8, 0x2d97) }, /* modem           + diagnostics + NMEA */

	{ USB_DEVICE(0x22b8, 0x2d99) }, /* modem + AT port               + NMEA */

	{ USB_DEVICE(0x22b8, 0x2d9a) }, /* modem + AT port + diagnostics + NMEA */



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

	.driver_info = NO_UNION_NORMAL, /* union descriptor misplaced on

					   data interface instead of

drivers/usb/gadget/f_mass_storage.c

+1 −0
Original line number Diff line number Diff line
@@ -2975,6 +2975,7 @@ static void fsg_unbind(struct usb_configuration *c, struct usb_function *f) 
	fsg_common_put(common);

	usb_free_descriptors(fsg->function.descriptors);

	usb_free_descriptors(fsg->function.hs_descriptors);

	usb_free_descriptors(fsg->function.ss_descriptors);

	kfree(fsg);

}

drivers/usb/renesas_usbhs/mod.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod) 
		if (mod->irq_attch)

			intenb1 |= ATTCHE;



		if (mod->irq_attch)

		if (mod->irq_dtch)

			intenb1 |= DTCHE;



		if (mod->irq_sign)

drivers/usb/renesas_usbhs/mod_host.c

+1 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,7 @@ int usbhs_mod_host_probe(struct usbhs_priv *priv) 
		dev_err(dev, "Failed to create hcd\n");

		return -ENOMEM;

	}

	hcd->has_tt = 1; /* for low/full speed */



	pipe_info = kzalloc(sizeof(*pipe_info) * pipe_size, GFP_KERNEL);

	if (!pipe_info) {

drivers/usb/serial/option.c

+6 −1
Original line number Diff line number Diff line
@@ -663,7 +663,12 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x01) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x02) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x03) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x08) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x10) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x12) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x13) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x02, 0x01) },  /* E398 3G Modem */

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x02, 0x02) },  /* E398 3G PC UI Interface */

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x02, 0x03) },  /* E398 3G Application Interface */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) },

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) },

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) },