1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index f867455dd339..8a1b98e3943c 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -589,8 +589,9 @@ struct domain_device *sas_find_dev_by_rphy(struct sas_rphy *rphy)
         struct sas_ha_struct *ha = SHOST_TO_SAS_HA(shost);
         struct domain_device *found_dev = NULL;
         int i;
+        unsigned long flags;
 
-        spin_lock(&ha->phy_port_lock);
+        spin_lock_irqsave(&ha->phy_port_lock, flags);
         for (i = 0; i < ha->num_phys; i++) {
                 struct asd_sas_port *port = ha->sas_port[i];
                 struct domain_device *dev;
@@ -606,7 +607,7 @@ struct domain_device *sas_find_dev_by_rphy(struct sas_rphy *rphy)
                 spin_unlock(&port->dev_list_lock);
         }
  found:
-        spin_unlock(&ha->phy_port_lock);
+        spin_unlock_irqrestore(&ha->phy_port_lock, flags);
 
         return found_dev;
 }