| From b9fc5320212efdfb4e08b825aaa007815fd11d16 Mon Sep 17 00:00:00 2001 |
| From: Bean Huo <beanhuo@micron.com> |
| Date: Mon, 20 Jan 2020 14:08:13 +0100 |
| Subject: scsi: ufs: Fix ufshcd_probe_hba() reture value in case ufshcd_scsi_add_wlus() fails |
| |
| From: Bean Huo <beanhuo@micron.com> |
| |
| commit b9fc5320212efdfb4e08b825aaa007815fd11d16 upstream. |
| |
| A non-zero error value likely being returned by ufshcd_scsi_add_wlus() in |
| case of failure of adding the WLs, but ufshcd_probe_hba() doesn't use this |
| value, and doesn't report this failure to upper caller. This patch is to |
| fix this issue. |
| |
| Fixes: 2a8fa600445c ("ufs: manually add well known logical units") |
| Link: https://lore.kernel.org/r/20200120130820.1737-2-huobean@gmail.com |
| Reviewed-by: Asutosh Das <asutoshd@codeaurora.org> |
| Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com> |
| Reviewed-by: Stanley Chu <stanley.chu@mediatek.com> |
| Signed-off-by: Bean Huo <beanhuo@micron.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/ufs/ufshcd.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/scsi/ufs/ufshcd.c |
| +++ b/drivers/scsi/ufs/ufshcd.c |
| @@ -6953,7 +6953,8 @@ static int ufshcd_probe_hba(struct ufs_h |
| ufshcd_init_icc_levels(hba); |
| |
| /* Add required well known logical units to scsi mid layer */ |
| - if (ufshcd_scsi_add_wlus(hba)) |
| + ret = ufshcd_scsi_add_wlus(hba); |
| + if (ret) |
| goto out; |
| |
| /* Initialize devfreq after UFS device is detected */ |
