aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-07-09 04:30:03 -0400
committerJames Bottomley <jejb@titanic.(none)>2005-07-11 10:35:39 -0400
commitcc33895abbba85668de11df2cd04d6faf0be43e1 (patch)
treef11e0b5542ac334a4e70c1a61d560458e848468d /drivers/scsi
parentace4e7185d565cab057139e8927659bd072bf25a (diff)
[SCSI] aic79xx: ahd_linux_dev_reset() cleanup
Use the macros consistently in ahd_linux_dev_reset(). If ahd_linux_dev_reset() really can be called with local interrupts disabled then yuk. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_osm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 5f526dd0aaa1..6466a184a141 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1553,7 +1553,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd)
1553 ahd_queue_scb(ahd, scb); 1553 ahd_queue_scb(ahd, scb);
1554 1554
1555 scb->platform_data->flags |= AHD_SCB_UP_EH_SEM; 1555 scb->platform_data->flags |= AHD_SCB_UP_EH_SEM;
1556 spin_unlock_irq(&ahd->platform_data->spin_lock); 1556 ahd_unlock(ahd, &s);
1557 init_timer(&timer); 1557 init_timer(&timer);
1558 timer.data = (u_long)scb; 1558 timer.data = (u_long)scb;
1559 timer.expires = jiffies + (5 * HZ); 1559 timer.expires = jiffies + (5 * HZ);
@@ -1567,7 +1567,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd)
1567 printf("Timer Expired\n"); 1567 printf("Timer Expired\n");
1568 retval = FAILED; 1568 retval = FAILED;
1569 } 1569 }
1570 spin_lock_irq(&ahd->platform_data->spin_lock); 1570 ahd_lock(ahd, &s);
1571 ahd_schedule_runq(ahd); 1571 ahd_schedule_runq(ahd);
1572 ahd_linux_run_complete_queue(ahd); 1572 ahd_linux_run_complete_queue(ahd);
1573 ahd_unlock(ahd, &s); 1573 ahd_unlock(ahd, &s);