summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aic7xxx/aic79xx_core.c
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2006-01-30 16:10:31 +0100
committerJames Bottomley <jejb@mulgrave.(none)>2006-01-31 14:39:50 -0600
commiteb221849540b7f4165c58b6c79d98b97ac902fdb (patch)
tree606f04871288b2b062f52fe2804e9320aa924644 /drivers/scsi/aic7xxx/aic79xx_core.c
parentd60256b1b3ceb79cb06a5dd5e259b23bd27d4c61 (diff)
downloadlinux-stable-eb221849540b7f4165c58b6c79d98b97ac902fdb.tar.gz
linux-stable-eb221849540b7f4165c58b6c79d98b97ac902fdb.tar.bz2
linux-stable-eb221849540b7f4165c58b6c79d98b97ac902fdb.zip
[SCSI] aic79xx: Fix timer handling
Fix the timer handling in aic79xx to use the SCSI-ML provided handling instead of implementing our own. It also fixes a deadlock in the command recovery code. Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx_core.c')
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_core.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 6114b3e72caa..342f77966a5b 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -8273,11 +8273,6 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb)
ahd_setup_data_scb(ahd, scb);
scb->flags |= SCB_SENSE;
ahd_queue_scb(ahd, scb);
- /*
- * Ensure we have enough time to actually
- * retrieve the sense.
- */
- ahd_scb_timer_reset(scb, 5 * 1000000);
break;
}
case SCSI_STATUS_OK: