1 files changed, 20 insertions, 1 deletions

diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index fbc2cb6667a1..6dfcb4fbccdd 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -819,12 +819,15 @@ ips_eh_abort(Scsi_Cmnd * SC)
         ips_ha_t *ha;
         ips_copp_wait_item_t *item;
         int ret;
+        unsigned long cpu_flags;
+        struct Scsi_Host *host;
 
         METHOD_TRACE("ips_eh_abort", 1);
 
         if (!SC)
                 return (FAILED);
 
+        host = SC->device->host;
         ha = (ips_ha_t *) SC->device->host->hostdata;
 
         if (!ha)
@@ -833,6 +836,8 @@ ips_eh_abort(Scsi_Cmnd * SC)
         if (!ha->active)
                 return (FAILED);
 
+        IPS_LOCK_SAVE(host->host_lock, cpu_flags);
+
         /* See if the command is on the copp queue */
         item = ha->copp_waitlist.head;
         while ((item) && (item->scsi_cmd != SC))
@@ -851,6 +856,8 @@ ips_eh_abort(Scsi_Cmnd * SC)
                 /* command must have already been sent */
                 ret = (FAILED);
         }
+
+        IPS_UNLOCK_RESTORE(host->host_lock, cpu_flags);
         return ret;
 }
 
@@ -866,7 +873,7 @@ ips_eh_abort(Scsi_Cmnd * SC)
 /*                                                                          */
 /****************************************************************************/
 static int
-ips_eh_reset(Scsi_Cmnd * SC)
+__ips_eh_reset(Scsi_Cmnd * SC)
 {
         int ret;
         int i;
@@ -1053,6 +1060,18 @@ ips_eh_reset(Scsi_Cmnd * SC)
 
 }
 
+static int
+ips_eh_reset(Scsi_Cmnd * SC)
+{
+        int rc;
+
+        spin_lock_irq(SC->device->host->host_lock);
+        rc = __ips_eh_reset(SC);
+        spin_unlock_irq(SC->device->host->host_lock);
+
+        return rc;
+}
+
 /****************************************************************************/
 /*                                                                          */
 /* Routine Name: ips_queue                                                  */