From d87e72fb4fda6c48909e870811ae5252d0520f99 Mon Sep 17 00:00:00 2001 From: Xiaofei Tan Date: Mon, 21 May 2018 18:09:24 +0800 Subject: [PATCH] scsi: hisi_sas: Fix return value when get_free_slot() failed It is an step of executing task to get free slot. If the step fails, we will cleanup LLDD resources and should return failure to upper layer or internal caller to abort task execution of this time. But in the current code, the caller of get_free_slot() doesn't return failure when get_free_slot() failed. This patch is to fix it. Signed-off-by: Xiaofei Tan Signed-off-by: John Garry Signed-off-by: Martin K. Petersen --- drivers/scsi/hisi_sas/hisi_sas_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index cd55849..3028024 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -443,6 +443,7 @@ static int hisi_sas_task_prep(struct sas_task *task, wr_q_index = hisi_hba->hw->get_free_slot(hisi_hba, dq); if (wr_q_index < 0) { spin_unlock_irqrestore(&dq->lock, flags_dq); + rc = -EAGAIN; goto err_out_buf; } @@ -1708,6 +1709,7 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, int device_id, wr_q_index = hisi_hba->hw->get_free_slot(hisi_hba, dq); if (wr_q_index < 0) { spin_unlock_irqrestore(&dq->lock, flags_dq); + rc = -EAGAIN; goto err_out_buf; } list_add_tail(&slot->delivery, &dq->list); -- 2.7.4