diff --git a/reactos/drivers/storage/disk/disk.c b/reactos/drivers/storage/disk/disk.c
index 6e094ed2fdb..7ad5a19b1d5 100644
--- a/reactos/drivers/storage/disk/disk.c
+++ b/reactos/drivers/storage/disk/disk.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: disk.c,v 1.10 2002/03/20 19:54:06 ekohl Exp $
+/* $Id: disk.c,v 1.11 2002/03/22 20:35:09 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -331,8 +331,22 @@ NTSTATUS STDCALL
 DiskClassCheckReadWrite(IN PDEVICE_OBJECT DeviceObject,
 			IN PIRP Irp)
 {
+  PDEVICE_EXTENSION DeviceExtension;
+  PDISK_DATA DiskData;
+
   DPRINT1("DiskClassCheckReadWrite() called\n");
 
+  DeviceExtension = DeviceObject->DeviceExtension;
+  DiskData = (PDISK_DATA)(DeviceExtension + 1);
+
+  if (DiskData->DriveNotReady == TRUE)
+    {
+      Irp->IoStatus.Status = STATUS_DEVICE_NOT_READY;
+      IoSetHardErrorOrVerifyDevice(Irp,
+				   DeviceObject);
+      return(STATUS_INVALID_PARAMETER);
+    }
+
   return(STATUS_SUCCESS);
 }