2 files changed, 8 insertions, 0 deletions

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index de42b5b801cd..0bb1a149a9c2 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -92,7 +92,9 @@ static void sas_ata_task_done(struct sas_task *task)
         struct task_status_struct *stat = &task->task_status;
         struct ata_task_resp *resp = (struct ata_task_resp *)stat->buf;
         enum ata_completion_errors ac;
+        unsigned long flags;
 
+        spin_lock_irqsave(dev->sata_dev.ap->lock, flags);
         if (stat->stat == SAS_PROTO_RESPONSE) {
                 ata_tf_from_fis(resp->ending_fis, &dev->sata_dev.tf);
                 qc->err_mask |= ac_err_mask(dev->sata_dev.tf.command);
@@ -113,6 +115,8 @@ static void sas_ata_task_done(struct sas_task *task)
         }
 
         ata_qc_complete(qc);
+        spin_unlock_irqrestore(dev->sata_dev.ap->lock, flags);
+
         list_del_init(&task->list);
         sas_free_task(task);
 }
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index dbc2a912114f..ba5c91b81312 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -216,8 +216,12 @@ int sas_queuecommand(struct scsi_cmnd *cmd,
                 struct sas_task *task;
 
                 if (dev_is_sata(dev)) {
+                        unsigned long flags;
+
+                        spin_lock_irqsave(dev->sata_dev.ap->lock, flags);
                         res = ata_sas_queuecmd(cmd, scsi_done,
                                                dev->sata_dev.ap);
+                        spin_unlock_irqrestore(dev->sata_dev.ap->lock, flags);
                         goto out;
                 }