aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2016-06-03 08:53:14 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2016-06-03 08:53:14 +0000
commit6fbb70afb8f487935f6f2fbd0f97c22761538e71 (patch)
tree708c35d8efad906c31f673f47d7f5f58721e9712
parent32a6d64c41a14c4003d3eb79196a8587988a692c (diff)
downloadsrc-6fbb70afb8f487935f6f2fbd0f97c22761538e71.tar.gz
src-6fbb70afb8f487935f6f2fbd0f97c22761538e71.zip
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.
Notes
Notes: svn path=/stable/8/; revision=301252
-rw-r--r--sys/dev/usb/usb_device.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c
index 374336649111..20321fdda86e 100644
--- a/sys/dev/usb/usb_device.c
+++ b/sys/dev/usb/usb_device.c
@@ -1739,7 +1739,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 */