diff options
| author | hselasky <hselasky@FreeBSD.org> | 2016-06-03 08:49:04 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2016-06-03 08:49:04 +0000 |
| commit | c52e067cf6cd08064df05a1271f07953eea0256d (patch) | |
| tree | 23d91e1b4652f9e4b4a7dc70da50c56a5d460d37 | |
| parent | ea8615c3032a52063cfb42147a04788ca2627827 (diff) | |
| download | FreeBSD-src-c52e067cf6cd08064df05a1271f07953eea0256d.zip FreeBSD-src-c52e067cf6cd08064df05a1271f07953eea0256d.tar.gz | |
MFC r299060:
Extend the UQ_NO_STRINGS quirk to also cover the USB language string
descriptor. This fixes enumeration of some older Samsung Galaxy S3
phones.
| -rw-r--r-- | sys/dev/usb/usb_device.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index 3e29aa4..bd62009 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -1777,7 +1777,9 @@ usb_alloc_device(device_t parent_dev, struct usb_bus *bus, scratch_ptr = udev->scratch.data; - if (udev->ddesc.iManufacturer || + if (udev->flags.no_strings) { + err = USB_ERR_INVAL; + } else if (udev->ddesc.iManufacturer || udev->ddesc.iProduct || udev->ddesc.iSerialNumber) { /* read out the language ID string */ |
