From 42ff9c13c03a90b1ea4cbff92da66e0f60d03db2 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Thu, 9 Feb 2012 15:33:09 +0000 Subject: [PATCH] [USBHUB] - Ignore error when the device provides a string descriptor but no contents - Fixes installation of cheap usb devices svn path=/branches/usb-bringup-trunk/; revision=55514 --- drivers/usb/usbhub_new/fdo.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/usb/usbhub_new/fdo.c b/drivers/usb/usbhub_new/fdo.c index 7b358eb6622..735911f23d0 100644 --- a/drivers/usb/usbhub_new/fdo.c +++ b/drivers/usb/usbhub_new/fdo.c @@ -1056,11 +1056,13 @@ CreateDeviceIds( if (!NT_SUCCESS(Status)) { DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); - return Status; + RtlInitUnicodeString(&UsbChildExtension->usTextDescription, ""); + } + else + { + UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; + DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); } - - UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; - DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); } //