From c2074c11e98115aa520db9c1b586fe461b4bbd62 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Tue, 4 Dec 2012 05:13:22 +0000 Subject: [PATCH] - Set SurpriseRemovalOK flag when IRP_MN_QUERY_CAPABILITIES was handled successfully - CORE-6447 svn path=/trunk/; revision=57796 --- reactos/drivers/hid/hidusb/hidusb.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/reactos/drivers/hid/hidusb/hidusb.c b/reactos/drivers/hid/hidusb/hidusb.c index a805012aad4..32a242f84b0 100644 --- a/reactos/drivers/hid/hidusb/hidusb.c +++ b/reactos/drivers/hid/hidusb/hidusb.c @@ -1686,10 +1686,13 @@ HidPnp( 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