Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HID]

Browse source 
- Hidclass must delete the FDO, not the minidriver.

svn path=/trunk/; revision=59011
This commit is contained in:
Thomas Faber 2013-05-12 18:51:11 +00:00
parent ab06a44464
commit 2f252b01ea
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/drivers/hid/hidclass/fdo.c
View file

@ -411,6 +411,13 @@ HidClassFDO_RemoveDevice(
IN PIRP Irp) IN PIRP Irp)
{ {
NTSTATUS Status; NTSTATUS Status;
PHIDCLASS_FDO_EXTENSION FDODeviceExtension;
//
// get device extension
//
FDODeviceExtension = DeviceObject->DeviceExtension;
ASSERT(FDODeviceExtension->Common.IsFDO);
/* FIXME cleanup */ /* FIXME cleanup */
@ -425,6 +432,13 @@ HidClassFDO_RemoveDevice(
// //
Irp->IoStatus.Status = Status; Irp->IoStatus.Status = Status;
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
//
// detach and delete device
//
IoDetachDevice(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject);
IoDeleteDevice(DeviceObject);
return Status; return Status;
} }

6
reactos/drivers/hid/hidusb/hidusb.c
View file

@ -1660,12 +1660,6 @@ HidPnp(
HidDeviceExtension->ConfigurationDescriptor = NULL; HidDeviceExtension->ConfigurationDescriptor = NULL;
} }
//
// delete and detach device
//
IoDetachDevice(DeviceExtension->NextDeviceObject);
IoDeleteDevice(DeviceObject);
return Status; return Status;
} }
case IRP_MN_QUERY_PNP_DEVICE_STATE: case IRP_MN_QUERY_PNP_DEVICE_STATE: