patch-2.4.0-test7 linux/drivers/scsi/scsi_ioctl.c

• Lines: 19
• Date: Mon Aug 21 09:20:16 2000
• Orig file: v2.4.0-test6/linux/drivers/scsi/scsi_ioctl.c
• Orig date: Thu Jul 27 17:38:01 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/scsi/scsi_ioctl.c linux/drivers/scsi/scsi_ioctl.c
@@ -24,6 +24,7 @@
 #define START_STOP_TIMEOUT		(60 * HZ)
 #define MOVE_MEDIUM_TIMEOUT		(5 * 60 * HZ)
 #define READ_ELEMENT_STATUS_TIMEOUT	(5 * 60 * HZ)
+#define READ_DEFECT_DATA_TIMEOUT	(60 * HZ )  /* ZIP-250 on parallel port takes as long! */
 
 #define MAX_BUF PAGE_SIZE
 
@@ -283,6 +284,10 @@
 	case READ_ELEMENT_STATUS:
 		timeout = READ_ELEMENT_STATUS_TIMEOUT;
 		retries = NORMAL_RETRIES;
+		break;
+	case READ_DEFECT_DATA:
+		timeout = READ_DEFECT_DATA_TIMEOUT;
+		retries = 1;
 		break;
 	default:
 		timeout = IOCTL_NORMAL_TIMEOUT;