svn commit: r299060 - head/sys/dev/usb

Hans Petter Selasky hselasky at FreeBSD.org
Wed May 4 08:57:41 UTC 2016


Author: hselasky
Date: Wed May  4 08:57:40 2016
New Revision: 299060
URL: https://svnweb.freebsd.org/changeset/base/299060

Log:
  Extend the UQ_NO_STRINGS quirk to also cover the USB language string
  descriptor. This fixes enumeration of some older Samsung Galaxy S3
  phones.
  
  MFC after:	1 week

Modified:
  head/sys/dev/usb/usb_device.c

Modified: head/sys/dev/usb/usb_device.c
==============================================================================
--- head/sys/dev/usb/usb_device.c	Wed May  4 07:39:23 2016	(r299059)
+++ head/sys/dev/usb/usb_device.c	Wed May  4 08:57:40 2016	(r299060)
@@ -1774,7 +1774,9 @@ usb_alloc_device(device_t parent_dev, st
 
 	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 */


More information about the svn-src-head mailing list