diff --git a/reactos/drivers/usb/usbhub/fdo.c b/reactos/drivers/usb/usbhub/fdo.c
index 475a93d46c8..0da1934b4d0 100644
--- a/reactos/drivers/usb/usbhub/fdo.c
+++ b/reactos/drivers/usb/usbhub/fdo.c
@@ -997,7 +997,7 @@ CreateDeviceIds(
         if (!NT_SUCCESS(Status))
         {
             DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status);
-            RtlInitUnicodeString(&UsbChildExtension->usTextDescription, L"");
+            RtlInitUnicodeString(&UsbChildExtension->usTextDescription, L"USB Device"); // FIXME NON-NLS
         }
         else
         {
@@ -1048,7 +1048,7 @@ CreateDeviceIds(
        DPRINT("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId);
     }
 
-    return Status;
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS
diff --git a/reactos/drivers/usb/usbhub/pdo.c b/reactos/drivers/usb/usbhub/pdo.c
index 9d2aa1ee378..28b4c7a4676 100644
--- a/reactos/drivers/usb/usbhub/pdo.c
+++ b/reactos/drivers/usb/usbhub/pdo.c
@@ -533,8 +533,8 @@ USBHUB_PdoQueryDeviceText(
 
     if (SourceString)
     {
-        ReturnString = ExAllocatePool(PagedPool, SourceString->Length);
-        RtlCopyMemory(ReturnString, SourceString->Buffer, SourceString->Length);
+        ReturnString = ExAllocatePool(PagedPool, SourceString->MaximumLength);
+        RtlCopyMemory(ReturnString, SourceString->Buffer, SourceString->MaximumLength);
         DPRINT1("%S\n", ReturnString);
         *Information = (ULONG_PTR)ReturnString;
     }