1 files changed, 5 insertions, 17 deletions

diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index e9920a009593..9ec4641a6348 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -1348,20 +1348,6 @@ static int aha1542_restart(struct Scsi_Host *shost)
         return 0;
 }
 
-static int aha1542_abort(Scsi_Cmnd * SCpnt)
-{
-
-        /*
-         * The abort command does not leave the device in a clean state where
-         *  it is available to be used again.  Until this gets worked out, we
-         * will leave it commented out.  
-         */
-
-        printk(KERN_ERR "aha1542.c: Unable to abort command for target %d\n",
-               SCpnt->device->id);
-        return FAILED;
-}
-
 /*
  * This is a device reset.  This is handled by sending a special command
  * to the device.
@@ -1478,8 +1464,8 @@ static int aha1542_bus_reset(Scsi_Cmnd * SCpnt)
          * check for timeout, and if we are doing something like this
          * we are pretty desperate anyways.
          */
-        spin_unlock_irq(SCpnt->device->host->host_lock);
         ssleep(4);
+
         spin_lock_irq(SCpnt->device->host->host_lock);
 
         WAIT(STATUS(SCpnt->device->host->io_port),
@@ -1517,9 +1503,11 @@ static int aha1542_bus_reset(Scsi_Cmnd * SCpnt)
                 }
         }
 
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return SUCCESS;
 
 fail:
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return FAILED;
 }
 
@@ -1542,7 +1530,6 @@ static int aha1542_host_reset(Scsi_Cmnd * SCpnt)
          * check for timeout, and if we are doing something like this
          * we are pretty desperate anyways.
          */
-        spin_unlock_irq(SCpnt->device->host->host_lock);
         ssleep(4);
         spin_lock_irq(SCpnt->device->host->host_lock);
 
@@ -1586,9 +1573,11 @@ static int aha1542_host_reset(Scsi_Cmnd * SCpnt)
                 }
         }
 
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return SUCCESS;
 
 fail:
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return FAILED;
 }
 
@@ -1817,7 +1806,6 @@ static Scsi_Host_Template driver_template = {
         .detect                 = aha1542_detect,
         .release                = aha1542_release,
         .queuecommand           = aha1542_queuecommand,
-        .eh_abort_handler       = aha1542_abort,
         .eh_device_reset_handler= aha1542_dev_reset,
         .eh_bus_reset_handler   = aha1542_bus_reset,
         .eh_host_reset_handler  = aha1542_host_reset,