diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-07-09 01:30:03 -0700 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-07-11 09:35:39 -0500 |
| commit | cc33895abbba85668de11df2cd04d6faf0be43e1 (patch) | |
| tree | f11e0b5542ac334a4e70c1a61d560458e848468d /drivers/scsi/aic7xxx | |
| parent | ace4e7185d565cab057139e8927659bd072bf25a (diff) | |
| download | linux-cc33895abbba85668de11df2cd04d6faf0be43e1.tar.gz linux-cc33895abbba85668de11df2cd04d6faf0be43e1.tar.bz2 linux-cc33895abbba85668de11df2cd04d6faf0be43e1.zip | |
[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/aic7xxx')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 4 |
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) ahd_queue_scb(ahd, scb); scb->platform_data->flags |= AHD_SCB_UP_EH_SEM; - spin_unlock_irq(&ahd->platform_data->spin_lock); + ahd_unlock(ahd, &s); init_timer(&timer); timer.data = (u_long)scb; timer.expires = jiffies + (5 * HZ); @@ -1567,7 +1567,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd) printf("Timer Expired\n"); retval = FAILED; } - spin_lock_irq(&ahd->platform_data->spin_lock); + ahd_lock(ahd, &s); ahd_schedule_runq(ahd); ahd_linux_run_complete_queue(ahd); ahd_unlock(ahd, &s); |