svn commit: r301251 - stable/9/sys/dev/usb

Hans Petter Selasky hselasky at FreeBSD.org
Fri Jun 3 08:50:45 UTC 2016


Author: hselasky
Date: Fri Jun  3 08:50:44 2016
New Revision: 301251
URL: https://svnweb.freebsd.org/changeset/base/301251

Log:
  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.

Modified:
  stable/9/sys/dev/usb/usb_device.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/usb_device.c
==============================================================================
--- stable/9/sys/dev/usb/usb_device.c	Fri Jun  3 08:49:04 2016	(r301250)
+++ stable/9/sys/dev/usb/usb_device.c	Fri Jun  3 08:50:44 2016	(r301251)
@@ -1744,7 +1744,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-stable-9 mailing list