diff --git a/reactos/drivers/video/miniport/vbe/vbemp.c b/reactos/drivers/video/miniport/vbe/vbemp.c
index 61e34178db9..2f44a583421 100644
--- a/reactos/drivers/video/miniport/vbe/vbemp.c
+++ b/reactos/drivers/video/miniport/vbe/vbemp.c
@@ -37,7 +37,7 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2)
    VIDEO_HW_INITIALIZATION_DATA InitData;
 
    VideoPortZeroMemory(&InitData, sizeof(InitData));
-   InitData.HwInitDataSize = sizeof(VIDEO_HW_INITIALIZATION_DATA);
+   InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA;
    InitData.HwFindAdapter = VBEFindAdapter;
    InitData.HwInitialize = VBEInitialize;
    InitData.HwStartIO = VBEStartIO;
diff --git a/reactos/drivers/video/miniport/vga/vgamp.c b/reactos/drivers/video/miniport/vga/vgamp.c
index b9bc3981b67..7cdd9c98162 100644
--- a/reactos/drivers/video/miniport/vga/vgamp.c
+++ b/reactos/drivers/video/miniport/vga/vgamp.c
@@ -31,7 +31,7 @@ DriverEntry(IN PVOID Context1,
 
   VideoPortZeroMemory(&InitData, sizeof InitData);
 
-  InitData.HwInitDataSize = sizeof(InitData);
+  InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA;
   /* FIXME: Fill in InitData members  */
   InitData.StartingDeviceNumber = 0;
 
diff --git a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
index ecf25bc9e79..cf8372c023d 100644
--- a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
+++ b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
@@ -42,7 +42,7 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2)
 
   VideoPortZeroMemory(&InitData, sizeof(InitData));
   InitData.AdapterInterfaceType = PCIBus;
-  InitData.HwInitDataSize = sizeof(VIDEO_HW_INITIALIZATION_DATA);
+  InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA;
   InitData.HwFindAdapter = XboxVmpFindAdapter;
   InitData.HwInitialize = XboxVmpInitialize;
   InitData.HwStartIO = XboxVmpStartIO;
diff --git a/reactos/drivers/video/videoprt/dispatch.c b/reactos/drivers/video/videoprt/dispatch.c
index 67afb2af3b0..631dad5c4bf 100644
--- a/reactos/drivers/video/videoprt/dispatch.c
+++ b/reactos/drivers/video/videoprt/dispatch.c
@@ -81,14 +81,7 @@ IntVideoPortAddDevice(
       DriverExtension,
       PhysicalDeviceObject,
       &DeviceObject);
-   if (!NT_SUCCESS(Status))
-      return Status;
 
-   if (PhysicalDeviceObject == NULL)
-   {
-      /* We will never have a IRP_MJ_PNP/IRP_MN_START_DEVICE Irp */
-      Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject);
-   }
    return Status;
 }