[SCSI] allow sleeping in ->eh_abort_handler()

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index a3fdead9bce..0018fb5c09a 100644
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -2118,7 +2118,7 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
         return 0;
 }
 
-static int ibmmca_abort(Scsi_Cmnd * cmd)
+static int __ibmmca_abort(Scsi_Cmnd * cmd)
 {
         /* Abort does not work, as the adapter never generates an interrupt on
          * whatever situation is simulated, even when really pending commands
@@ -2225,6 +2225,18 @@ static int ibmmca_abort(Scsi_Cmnd * cmd)
         }
 }
 
+static int ibmmca_abort(Scsi_Cmnd * cmd)
+{
+        struct Scsi_Host *shpnt = cmd->device->host;
+        int rc;
+
+        spin_lock_irq(shpnt->host_lock);
+        rc = __ibmmca_abort(cmd);
+        spin_unlock_irq(shpnt->host_lock);
+
+        return rc;
+}
+
 static int ibmmca_host_reset(Scsi_Cmnd * cmd)
 {
         struct Scsi_Host *shpnt;