[SCSI] audit drivers for incorrect max_id use

max_id now means the maximum number of ids on the bus, which means it
is one greater than the largest possible id number.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

5 files changed, 8 insertions, 8 deletions

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 6a0f9506ea00..b767918b9a98 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -376,7 +376,7 @@ NCR_700_detect(struct scsi_host_template *tpnt,
         dma_sync_single_for_device(hostdata->dev, pScript, sizeof(SCRIPT), DMA_TO_DEVICE);
         hostdata->state = NCR_700_HOST_FREE;
         hostdata->cmd = NULL;
-        host->max_id = 7;
+        host->max_id = 8;
         host->max_lun = NCR_700_MAX_LUNS;
         BUG_ON(NCR_700_transport_template == NULL);
         host->transportt = NCR_700_transport_template;
diff --git a/drivers/scsi/53c7xx.c b/drivers/scsi/53c7xx.c
index 7894b8ea84bd..cfc991271cc8 100644
--- a/drivers/scsi/53c7xx.c
+++ b/drivers/scsi/53c7xx.c
@@ -709,7 +709,7 @@ request_synchronous (int host, int target) {
         printk (KERN_ALERT "target %d is host ID\n", target);
         return -1;
     } 
-    else if (target > h->max_id) {
+    else if (target >= h->max_id) {
         printk (KERN_ALERT "target %d exceeds maximum of %d\n", target,
             h->max_id);
         return -1;
@@ -3622,7 +3622,7 @@ NCR53c7xx_queue_command (Scsi_Cmnd *cmd, void (* done)(Scsi_Cmnd *)) {
 #ifdef LINUX_1_2
         || cmd->device->id > 7
 #else
-        || cmd->device->id > host->max_id
+        || cmd->device->id >= host->max_id
 #endif
         || cmd->device->id == host->this_id
         || hostdata->state == STATE_DISABLED) {
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 08771f6f6859..e14244aa69d7 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -9396,8 +9396,8 @@ ahd_find_tmode_devs(struct ahd_softc *ahd, struct cam_sim *sim, union ccb *ccb,
         } else {
                 u_int max_id;
 
-                max_id = (ahd->features & AHD_WIDE) ? 15 : 7;
-                if (ccb->ccb_h.target_id > max_id)
+                max_id = (ahd->features & AHD_WIDE) ? 16 : 8;
+                if (ccb->ccb_h.target_id >= max_id)
                         return (CAM_TID_INVALID);
 
                 if (ccb->ccb_h.target_lun >= AHD_NUM_LUNS)
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index d37566978fba..50a3dd047cfe 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -6774,8 +6774,8 @@ ahc_find_tmode_devs(struct ahc_softc *ahc, struct cam_sim *sim, union ccb *ccb,
         } else {
                 u_int max_id;
 
-                max_id = (ahc->features & AHC_WIDE) ? 15 : 7;
-                if (ccb->ccb_h.target_id > max_id)
+                max_id = (ahc->features & AHC_WIDE) ? 16 : 8;
+                if (ccb->ccb_h.target_id >= max_id)
                         return (CAM_TID_INVALID);
 
                 if (ccb->ccb_h.target_lun >= AHC_NUM_LUNS)
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index a198d86667e9..58d7e34807aa 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -3047,7 +3047,7 @@ flash_ok_885:
                 if (atp_dev.chip_ver == 4)
                         shpnt->max_id = 16;
                 else            
-                        shpnt->max_id = 7;
+                        shpnt->max_id = 8;
                 shpnt->this_id = host_id;
                 shpnt->unique_id = base_io;
                 shpnt->io_port = base_io;