[CDFS_NEW] Bugfix for f88fe43: don't delete devices twice on shutdown.
authorPierre Schweitzer <pierre@reactos.org>
Sun, 12 Nov 2017 17:57:11 +0000 (18:57 +0100)
committerPierre Schweitzer <pierre@reactos.org>
Sun, 12 Nov 2017 17:58:43 +0000 (18:58 +0100)
With that bugfix, I can install ROS from ISO on HDD without troubles :-)
CORE-13184

drivers/filesystems/cdfs_new/cdinit.c

index aac879a..b6bec14 100755 (executable)
@@ -241,10 +241,16 @@ Return Value:
 
 --*/
 {
+#ifdef __REACTOS__
+    ASSERT(DeviceObject == CdData.FileSystemDeviceObject ||
+           DeviceObject == CdData.HddFileSystemDeviceObject);
+#endif
+
     IoUnregisterFileSystem (DeviceObject);
+#ifndef __REACTOS__
     IoDeleteDevice (CdData.FileSystemDeviceObject);
-#ifdef __REACTOS__
-    IoDeleteDevice (CdData.HddFileSystemDeviceObject);
+#else
+    IoDeleteDevice (DeviceObject);
 #endif
 
     CdCompleteRequest( NULL, Irp, STATUS_SUCCESS );