From: Venkatraman S <svenkatr@xxxxxx> Subject: drivers/scsi/ufs: fix evaluation of task_failed status Else FAILED would be set even if task_result was originally equal to UPIU_TASK_MANAGEMENT_FUNC_SUCCEEDED. Reported-by: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Venkatraman S <svenkatr@xxxxxx> Reviewed-by: Namjae Jeon <linkinjeon@xxxxxxxxx> Acked-by: Santosh Y <santoshsy@xxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/scsi/ufs/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/scsi/ufs/ufshcd.c~drivers-scsi-ufs-fix-evaluation-of-task_failed-status drivers/scsi/ufs/ufshcd.c --- a/drivers/scsi/ufs/ufshcd.c~drivers-scsi-ufs-fix-evaluation-of-task_failed-status +++ a/drivers/scsi/ufs/ufshcd.c @@ -1160,7 +1160,7 @@ static int ufshcd_task_req_compl(struct task_result = be32_to_cpu(task_rsp_upiup->header.dword_1); task_result = ((task_result & MASK_TASK_RESPONSE) >> 8); - if (task_result != UPIU_TASK_MANAGEMENT_FUNC_COMPL || + if (task_result != UPIU_TASK_MANAGEMENT_FUNC_COMPL && task_result != UPIU_TASK_MANAGEMENT_FUNC_SUCCEEDED) task_result = FAILED; } else { _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html