[HIDUSB]

- Retrieve protocol after configuration has been selected
- Fixes HID regression
See issue #6886 for more details.

svn path=/trunk/; revision=55572

diff --git a/reactos/drivers/hid/hidusb/hidusb.c b/reactos/drivers/hid/hidusb/hidusb.c
index 4fc26fd..79720ac 100644 (file)
--- a/reactos/drivers/hid/hidusb/hidusb.c
+++ b/reactos/drivers/hid/hidusb/hidusb.c
@@ -1311,6 +1311,7 @@ Hid_GetProtocol(
     //
     DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
     HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension;
+    ASSERT(HidDeviceExtension->InterfaceInfo);
 
     if (HidDeviceExtension->InterfaceInfo->SubClass != 0x1)
     {
@@ -1487,11 +1488,6 @@ Hid_PnpStart(
     //
     Hid_SetIdle(DeviceObject);
 
-    //
-    // get protocol
-    //
-    Hid_GetProtocol(DeviceObject);
-
     //
     // move to next descriptor
     //
@@ -1518,6 +1514,11 @@ Hid_PnpStart(
         // done
         //
         DPRINT("[HIDUSB] SelectConfiguration %x\n", Status);
+
+        //
+        // get protocol
+        //
+        Hid_GetProtocol(DeviceObject);
         return Status;
     }
 
@@ -1526,6 +1527,11 @@ Hid_PnpStart(
     //
     UNIMPLEMENTED
     ASSERT(FALSE);
+
+    //
+    // get protocol
+    //
+    Hid_GetProtocol(DeviceObject);
     return STATUS_SUCCESS;
 }