Merge remote-tracking branch 'trivial/for-next'

[karo-tx-linux.git] / drivers / scsi / ufs / ufshcd.c

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 85cd2564c15773f728e8bd6ae6fcde28867ab2bb..f6e74028d71c3e42335542b83b7bb05d3a6ecc18 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -3751,9 +3751,9 @@ static int ufshcd_issue_tm_cmd(struct ufs_hba *hba, int lun_id, int task_id,
        if (!err) {
                dev_err(hba->dev, "%s: task management cmd 0x%.2x timed-out\n",
                                __func__, tm_function);
-               if (ufshcd_clear_tm_cmd(hba, free_slot))
-                       dev_WARN(hba->dev, "%s: unable clear tm cmd (slot %d) after timeout\n",
-                                       __func__, free_slot);
+               dev_WARN(hba->dev, ufshcd_clear_tm_cmd(hba, free_slot),
+                               "%s: unable clear tm cmd (slot %d) after timeout\n",
+                               __func__, free_slot);
                err = -ETIMEDOUT;
        } else {
                err = ufshcd_task_req_compl(hba, free_slot, tm_response);