Sync up drivers/scsi/aic7xxx

@@ -36,7 +36,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7770_osm.c#20 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7770_osm.c#21 $
  */
 
 #include "aic7xxx_osm.h"

@@ -179,10 +179,8 @@
 		return (ENOMEM);
 	strcpy(name, buf);
 	ahc = ahc_alloc(&aic7xxx_driver_template, name);
-	if (ahc == NULL) {
-		free(name, M_DEVBUF);
+	if (ahc == NULL)
 		return (ENOMEM);
-	}
 	ahc->dev_softc = dev;
 	if (aic_set_dma_mask(ahc, 0xFFFFFFFF) != 0
        /*|| aic_set_consistent_dma_mask(ahc, 0xFFFFFFFF) != 0 */) {

@@ -1,7 +1,7 @@
 /*
  * Adaptec AIC79xx device driver for Linux.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#213 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#215 $
  *
  * --------------------------------------------------------------------------
  * Copyright (c) 1994-2000 Justin T. Gibbs.

@@ -1102,7 +1102,7 @@
 		       ahd_name(ahd));
 		return (0);
 	} else if ((dev->flags & AIC_DEV_UNCONFIGURED) != 0
-		&& cmd->device->type != -1) {
+		&& cmd->device->type != (char) -1) {
 		/*
 		 * Configure devices that have already successfully
 		 * completed an inquiry. This  handles the case of

@@ -1669,6 +1669,8 @@
 
 	ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
 	recovery_cmd = malloc(sizeof(struct scsi_cmnd), M_DEVBUF, M_WAITOK);
+	if (!recovery_cmd)
+		return (FAILED);
 	memset(recovery_cmd, 0, sizeof(struct scsi_cmnd));
 	recovery_cmd->device = cmd->device;
 	recovery_cmd->scsi_done = ahd_linux_dev_reset_complete;

@@ -1684,10 +1686,12 @@
 				   cmd->device->lun, /*alloc*/FALSE);
 	if (dev == NULL) {
 		ahd_entrypoint_unlock(ahd, &s);
+		free(recovery_cmd, M_DEVBUF);
 		return (FAILED);
 	}
 	if ((scb = ahd_get_scb(ahd, AHD_NEVER_COL_IDX)) == NULL) {
 		ahd_entrypoint_unlock(ahd, &s);
+		free(recovery_cmd, M_DEVBUF);
 		return (FAILED);
 	}
 	tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,

@@ -3120,7 +3124,7 @@
 				break;
 			}
 			if (status & SSQ_DELAY)
-				scsi_sleep(1 * HZ);
+				ssleep(1);
 
 			break;
 		case SS_START:

@@ -3290,7 +3294,7 @@
 			}
 			if (targ->dv_state_retry <= 10) {
 				if ((status & (SSQ_DELAY_RANDOM|SSQ_DELAY))!= 0)
-					scsi_sleep(ahd->our_id*HZ/10);
+					msleep(ahd->our_id*100);
 				break;
 			}
 #ifdef AHD_DEBUG

@@ -3334,7 +3338,7 @@
 				targ->dv_state_retry--;
 			} else if (targ->dv_state_retry < 60) {
 				if ((status & SSQ_DELAY) != 0)
-					scsi_sleep(1 * HZ);
+					ssleep(1);
 			} else {
 #ifdef AHD_DEBUG
 				if (ahd_debug & AHD_SHOW_DV) {

@@ -1,7 +1,7 @@
 /*
  * Adaptec AIC7xxx device driver for Linux.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#276 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#277 $
  *
  * Copyright (c) 1994 John Aycock
  *   The University of Calgary Department of Computer Science.

@@ -2794,7 +2794,7 @@
 				break;
 			}
 			if (status & SSQ_DELAY)
-				scsi_sleep(1 * HZ);
+				ssleep(1);
 
 			break;
 		case SS_START:

@@ -2964,7 +2964,7 @@
 			}
 			if (targ->dv_state_retry <= 10) {
 				if ((status & (SSQ_DELAY_RANDOM|SSQ_DELAY))!= 0)
-					scsi_sleep(ahc->our_id*HZ/10);
+					msleep(ahc->our_id*100);
 				break;
 			}
 #ifdef AHC_DEBUG

@@ -3008,7 +3008,7 @@
 				targ->dv_state_retry--;
 			} else if (targ->dv_state_retry < 60) {
 				if ((status & SSQ_DELAY) != 0)
-					scsi_sleep(1 * HZ);
+					ssleep(1);
 			} else {
 #ifdef AHC_DEBUG
 				if (ahc_debug & AHC_SHOW_DV) {

@@ -2341,4 +2341,9 @@
         }
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
+#define ssleep(a)  scsi_sleep((a)*HZ)
+#define msleep(a)  scsi_sleep((a))
+#endif
+
 #endif /*_AICLIB_H */