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 tag 'usb-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
"Here are some small USB driver fixes and quirk updates for 5.0-rc2.

The majority here are some quirks for some storage devices to get them
to work properly. There's also a fix here to resolve the reported
issues with some audio devices that say they are UAC3 compliant, but
really are not.

And a fix up for the MAINTAINERS file to remove a dead url.

All have been in linux-next with no reported issues"

* tag 'usb-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
usb: storage: Remove outdated URL from MAINTAINERS
USB: Add USB_QUIRK_DELAY_CTRL_MSG quirk for Corsair K70 RGB
usbcore: Select only first configuration for non-UAC3 compliant devices
USB: storage: add quirk for SMI SM3350
USB: storage: don't insert sane sense for SPC3+ when bad sense specified
usb: cdc-acm: send ZLP for Telit 3G Intel based modems

Linus Torvalds 1dd8a3f6 0f9d140a

+33 -7
-1
MAINTAINERS
··· 15806 15806 L: linux-usb@vger.kernel.org 15807 15807 L: usb-storage@lists.one-eyed-alien.net 15808 15808 S: Maintained 15809 - W: http://www.one-eyed-alien.net/~mdharm/linux-usb/ 15810 15809 F: drivers/usb/storage/ 15811 15810 15812 15811 USB MIDI DRIVER
+7
drivers/usb/class/cdc-acm.c
··· 1865 1865 .driver_info = IGNORE_DEVICE, 1866 1866 }, 1867 1867 1868 + { USB_DEVICE(0x1bc7, 0x0021), /* Telit 3G ACM only composition */ 1869 + .driver_info = SEND_ZERO_PACKET, 1870 + }, 1871 + { USB_DEVICE(0x1bc7, 0x0023), /* Telit 3G ACM + ECM composition */ 1872 + .driver_info = SEND_ZERO_PACKET, 1873 + }, 1874 + 1868 1875 /* control interfaces without any protocol set */ 1869 1876 { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, 1870 1877 USB_CDC_PROTO_NONE) },
+6 -3
drivers/usb/core/generic.c
··· 143 143 continue; 144 144 } 145 145 146 - if (i > 0 && desc && is_audio(desc) && is_uac3_config(desc)) { 147 - best = c; 148 - break; 146 + if (i > 0 && desc && is_audio(desc)) { 147 + if (is_uac3_config(desc)) { 148 + best = c; 149 + break; 150 + } 151 + continue; 149 152 } 150 153 151 154 /* From the remaining configs, choose the first one whose
+2 -1
drivers/usb/core/quirks.c
··· 394 394 { USB_DEVICE(0x1a40, 0x0101), .driver_info = USB_QUIRK_HUB_SLOW_RESET }, 395 395 396 396 /* Corsair K70 RGB */ 397 - { USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT }, 397 + { USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT | 398 + USB_QUIRK_DELAY_CTRL_MSG }, 398 399 399 400 /* Corsair Strafe */ 400 401 { USB_DEVICE(0x1b1c, 0x1b15), .driver_info = USB_QUIRK_DELAY_INIT |
+6 -2
drivers/usb/storage/scsiglue.c
··· 235 235 if (!(us->fflags & US_FL_NEEDS_CAP16)) 236 236 sdev->try_rc_10_first = 1; 237 237 238 - /* assume SPC3 or latter devices support sense size > 18 */ 239 - if (sdev->scsi_level > SCSI_SPC_2) 238 + /* 239 + * assume SPC3 or latter devices support sense size > 18 240 + * unless US_FL_BAD_SENSE quirk is specified. 241 + */ 242 + if (sdev->scsi_level > SCSI_SPC_2 && 243 + !(us->fflags & US_FL_BAD_SENSE)) 240 244 us->fflags |= US_FL_SANE_SENSE; 241 245 242 246 /*
+12
drivers/usb/storage/unusual_devs.h
··· 1266 1266 US_FL_FIX_CAPACITY ), 1267 1267 1268 1268 /* 1269 + * Reported by Icenowy Zheng <icenowy@aosc.io> 1270 + * The SMI SM3350 USB-UFS bridge controller will enter a wrong state 1271 + * that do not process read/write command if a long sense is requested, 1272 + * so force to use 18-byte sense. 1273 + */ 1274 + UNUSUAL_DEV( 0x090c, 0x3350, 0x0000, 0xffff, 1275 + "SMI", 1276 + "SM3350 UFS-to-USB-Mass-Storage bridge", 1277 + USB_SC_DEVICE, USB_PR_DEVICE, NULL, 1278 + US_FL_BAD_SENSE ), 1279 + 1280 + /* 1269 1281 * Reported by Paul Hartman <paul.hartman+linux@gmail.com> 1270 1282 * This card reader returns "Illegal Request, Logical Block Address 1271 1283 * Out of Range" for the first READ(10) after a new card is inserted.