tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Linus Torvalds f242bbc5 ddf5a25c

+19 -2
+10
drivers/usb/class/cdc-acm.c
··· 1458 1458 }, 1459 1459 { USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */ 1460 1460 }, 1461 + /* Motorola H24 HSPA module: */ 1462 + { USB_DEVICE(0x22b8, 0x2d91) }, /* modem */ 1463 + { USB_DEVICE(0x22b8, 0x2d92) }, /* modem + diagnostics */ 1464 + { USB_DEVICE(0x22b8, 0x2d93) }, /* modem + AT port */ 1465 + { USB_DEVICE(0x22b8, 0x2d95) }, /* modem + AT port + diagnostics */ 1466 + { USB_DEVICE(0x22b8, 0x2d96) }, /* modem + NMEA */ 1467 + { USB_DEVICE(0x22b8, 0x2d97) }, /* modem + diagnostics + NMEA */ 1468 + { USB_DEVICE(0x22b8, 0x2d99) }, /* modem + AT port + NMEA */ 1469 + { USB_DEVICE(0x22b8, 0x2d9a) }, /* modem + AT port + diagnostics + NMEA */ 1470 + 1461 1471 { USB_DEVICE(0x0572, 0x1329), /* Hummingbird huc56s (Conexant) */ 1462 1472 .driver_info = NO_UNION_NORMAL, /* union descriptor misplaced on 1463 1473 data interface instead of
+1
drivers/usb/gadget/f_mass_storage.c
··· 2975 2975 fsg_common_put(common); 2976 2976 usb_free_descriptors(fsg->function.descriptors); 2977 2977 usb_free_descriptors(fsg->function.hs_descriptors); 2978 + usb_free_descriptors(fsg->function.ss_descriptors); 2978 2979 kfree(fsg); 2979 2980 } 2980 2981
+1 -1
drivers/usb/renesas_usbhs/mod.c
··· 349 349 if (mod->irq_attch) 350 350 intenb1 |= ATTCHE; 351 351 352 - if (mod->irq_attch) 352 + if (mod->irq_dtch) 353 353 intenb1 |= DTCHE; 354 354 355 355 if (mod->irq_sign)
+1
drivers/usb/renesas_usbhs/mod_host.c
··· 1267 1267 dev_err(dev, "Failed to create hcd\n"); 1268 1268 return -ENOMEM; 1269 1269 } 1270 + hcd->has_tt = 1; /* for low/full speed */ 1270 1271 1271 1272 pipe_info = kzalloc(sizeof(*pipe_info) * pipe_size, GFP_KERNEL); 1272 1273 if (!pipe_info) {
+6 -1
drivers/usb/serial/option.c
··· 663 663 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x01) }, 664 664 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x02) }, 665 665 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x03) }, 666 - { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x08) }, 666 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x10) }, 667 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x12) }, 668 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x13) }, 669 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x02, 0x01) }, /* E398 3G Modem */ 670 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x02, 0x02) }, /* E398 3G PC UI Interface */ 671 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x02, 0x03) }, /* E398 3G Application Interface */ 667 672 { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, 668 673 { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, 669 674 { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) },