USB root hub is not really a child of the USB Controller, so don't give it a device...

svn path=/trunk/; revision=18071

diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index 8f8a7e0..4fce234 100644 (file)
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -606,6 +606,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","0",0x00000000,"PCI\VEN_80
 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","Count",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","NextInstance",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615AD&REV_00\0000","Service",0x0000000,"usbuhci"
 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","Count",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","NextInstance",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615AD&REV_00\0000","Service",0x0000000,"usbuhci"

+HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615AD&REV_00\0000","ParentIdPrefix",0x0000000,"0000"

 
 ;USB OHCI Driver (Cromwell), especially the same name as windows OHCI miniport
 HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001
 
 ;USB OHCI Driver (Cromwell), especially the same name as windows OHCI miniport
 HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001

diff --git a/reactos/drivers/usb/miniport/common/pdo.c b/reactos/drivers/usb/miniport/common/pdo.c
index 3df4a0b..10e3beb 100644 (file)
--- a/reactos/drivers/usb/miniport/common/pdo.c
+++ b/reactos/drivers/usb/miniport/common/pdo.c
@@ -170,7 +170,7 @@ UsbMpPdoQueryId(
                case BusQueryInstanceID:
                {
                        DPRINT("USBMP: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n");
                case BusQueryInstanceID:
                {
                        DPRINT("USBMP: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n");

-                       RtlInitUnicodeString(&SourceString, L"0000"); /* FIXME */
+                       RtlInitUnicodeString(&SourceString, L"");

                        break;
                }
                default:
                        break;
                }
                default: