diff options
| author |   Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-19 21:50:12 -0400 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@pobox.com> | 2005-06-19 21:50:12 -0400 |
| commit | e632ba11b8ea34cc877689dba1e02f8657ddbc0b (patch) | |
| tree | aafaa0f78e56d0eeea753b9d2f105d91ba230b4a /drivers | |
| parent | fc4/fc: fix warnings and errors related to recent SCSI EH updates (diff) | |
| download | linux-dev-e632ba11b8ea34cc877689dba1e02f8657ddbc0b.tar.xz linux-dev-e632ba11b8ea34cc877689dba1e02f8657ddbc0b.zip | |
aic7xxx/aic79xx_osm: revert completely bogus ahd_linux_queue() patch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index c4eaaad2c69b..5f526dd0aaa1 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c @@ -941,7 +941,7 @@ ahd_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *)) */ cmd->scsi_done = scsi_done; - ahd_lock(ahd, &flags); + ahd_midlayer_entrypoint_lock(ahd, &flags); /* * Close the race of a command that was in the process of @@ -955,7 +955,7 @@ ahd_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *)) ahd_cmd_set_transaction_status(cmd, CAM_REQUEUE_REQ); ahd_linux_queue_cmd_complete(ahd, cmd); ahd_schedule_completeq(ahd); - ahd_unlock(ahd, &flags); + ahd_midlayer_entrypoint_unlock(ahd, &flags); return (0); } dev = ahd_linux_get_device(ahd, cmd->device->channel, @@ -965,7 +965,7 @@ ahd_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *)) ahd_cmd_set_transaction_status(cmd, CAM_RESRC_UNAVAIL); ahd_linux_queue_cmd_complete(ahd, cmd); ahd_schedule_completeq(ahd); - ahd_unlock(ahd, &flags); + ahd_midlayer_entrypoint_unlock(ahd, &flags); printf("%s: aic79xx_linux_queue - Unable to allocate device!\n", ahd_name(ahd)); return (0); @@ -979,7 +979,7 @@ ahd_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *)) dev->flags |= AHD_DEV_ON_RUN_LIST; ahd_linux_run_device_queues(ahd); } - ahd_unlock(ahd, &flags); + ahd_midlayer_entrypoint_unlock(ahd, &flags); return (0); } |