Index: floppy.c
===================================================================
--- floppy.c	(revision 28830)
+++ floppy.c	(working copy)
@@ -696,6 +696,13 @@
       return STATUS_IO_DEVICE_ERROR;
     }
 
+  /* Check if floppy drive exists */
+  if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS)
+	{
+	  DPRINT("floppy: Floppy drive not detected! Returning STATUS_IO_DEVICE_ERROR\n");
+	  return STATUS_IO_DEVICE_ERROR;
+	}
+
   DPRINT("floppy: InitController: waiting for initial interrupt\n");
 
   /* Wait for an interrupt */