- Set SurpriseRemovalOK flag when IRP_MN_QUERY_CAPABILITIES was handled successfully

- CORE-6447

svn path=/trunk/; revision=57796

diff --git a/reactos/drivers/hid/hidusb/hidusb.c b/reactos/drivers/hid/hidusb/hidusb.c
index a805012..32a242f 100644 (file)
--- a/reactos/drivers/hid/hidusb/hidusb.c
+++ b/reactos/drivers/hid/hidusb/hidusb.c
@@ -1686,10 +1686,13 @@ HidPnp(
                 Status = Irp->IoStatus.Status;
             }
 
                 Status = Irp->IoStatus.Status;
             }
 

-            //
-            // don't need to safely remove
-            //
-            IoStack->Parameters.DeviceCapabilities.Capabilities->SurpriseRemovalOK = TRUE;
+            if (NT_SUCCESS(Status) && IoStack->Parameters.DeviceCapabilities.Capabilities != NULL)
+            {
+                //
+                // don't need to safely remove
+                //
+                IoStack->Parameters.DeviceCapabilities.Capabilities->SurpriseRemovalOK = TRUE;
+            }

 
             //
             // done
 
             //
             // done