From 869df73304130376fee40cff1f347a0daa7966a4 Mon Sep 17 00:00:00 2001
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 4 May 2016 08:57:40 +0000
Subject: [PATCH] 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
---
 sys/dev/usb/usb_device.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c
index df9fea60eaa6..30336a13dac0 100644
--- a/sys/dev/usb/usb_device.c
+++ b/sys/dev/usb/usb_device.c
@@ -1774,7 +1774,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 */