From a4870d538f6731ee522ba6d967cc66967117bed1 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Mon, 13 Feb 2012 11:12:58 +0000
Subject: [PATCH] [HIDUSB] - Retrieve protocol after configuration has been
 selected - Fixes HID regression See issue #6886 for more details.

svn path=/trunk/; revision=55572
---
 reactos/drivers/hid/hidusb/hidusb.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/reactos/drivers/hid/hidusb/hidusb.c b/reactos/drivers/hid/hidusb/hidusb.c
index 4fc26fd5cd7..79720ac44a2 100644
--- 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;
 }
 
-- 
2.17.1