diff -ru 2.4.0-test11-pre4/drivers/scsi/imm.c 2.4.0-test11-pre4-my/drivers/scsi/imm.c
--- 2.4.0-test11-pre4/drivers/scsi/imm.c	Wed Nov 15 19:39:41 2000
+++ 2.4.0-test11-pre4-my/drivers/scsi/imm.c	Wed Nov 15 19:44:56 2000
@@ -212,8 +212,11 @@
 	    return 0;
 	try_again = 1;
 	goto retry_entry;
-    } else
-	return 1;		/* return number of hosts detected */
+    } else {
+	 /* now enable the new code */
+	 host->use_new_eh_code = 1;
+	 return 1;		/* return number of hosts detected */
+    }	 
 }
 
 /* This is to give the imm driver a way to modify the timings (and other
diff -ru 2.4.0-test11-pre4/drivers/scsi/imm.h 2.4.0-test11-pre4-my/drivers/scsi/imm.h
--- 2.4.0-test11-pre4/drivers/scsi/imm.h	Wed Nov 15 19:40:44 2000
+++ 2.4.0-test11-pre4-my/drivers/scsi/imm.h	Wed Nov 15 20:01:11 2000
@@ -10,7 +10,7 @@
 #ifndef _IMM_H
 #define _IMM_H
 
-#define   IMM_VERSION   "2.04 (for Linux 2.4.0)"
+#define   IMM_VERSION   "2.05 (for Linux 2.4.0)"
 
 /* 
  * 10 Apr 1998 (Good Friday) - Received EN144302 by email from Iomega.
@@ -60,6 +60,9 @@
  *    added CONFIG_SCSI_IZIP_SLOW_CTR option
  *                                                      [2.03]
  *  Fix kernel panic on scsi timeout.		20Aug00 [2.04]
+ *
+ *  Fix a lockup during detection of drive      14Nov00 [2.05]
+ *  Gert Wollny <wollny@cns.mpg.de>
  */
 /* ------ END OF USER CONFIGURABLE PARAMETERS ----- */
 
@@ -172,7 +175,7 @@
                 eh_device_reset_handler:        NULL,                   \
                 eh_bus_reset_handler:           imm_reset,              \
                 eh_host_reset_handler:          imm_reset,              \
-		use_new_eh_code:		1,			\
+		use_new_eh_code:		0,			\
 		bios_param:		        imm_biosparam,		\
 		this_id:			7,			\
 		sg_tablesize:			SG_ALL,			\