Only initialise once in AddDevice

including Storport. Signed-off-by: Jorgen Lundman <[email protected]>
openzfsonwindows · Sep 13, 2024 · a3166ef · a3166ef
1 parent 9a51750
commit a3166ef
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/module/os/windows/zfs/zfs_ioctl_os.c b/module/os/windows/zfs/zfs_ioctl_os.c
@@ -1144,7 +1144,8 @@ OpenZFS_AddDevice(
 	}
 
 	// From DriverLoad
-	if (PhysicalDeviceObject->DeviceType == FILE_DEVICE_CONTROLLER) {
+	if (PhysicalDeviceObject->DeviceType == FILE_DEVICE_CONTROLLER &&
+	    DriverExtension->PhysicalDeviceObject == NULL) {
 
 		DriverExtension->PhysicalDeviceObject = PhysicalDeviceObject;
 
@@ -1264,13 +1265,6 @@ OpenZFS_AddDevice(
 		return (STATUS_SUCCESS);
 	}
 
-	dprintf("Weird, AddDevice calling StorPort\n");
-
-	// Let StorPort have a go
-	if (DriverExtension->STOR_AddDevice)
-		status = DriverExtension->STOR_AddDevice(DriverObject,
-		    PhysicalDeviceObject);
-
 	return (STATUS_SUCCESS);
 }