| From 3383791e0ed7962bce73a2995d4b980a373e8df2 Mon Sep 17 00:00:00 2001 |
| From: Kangjie Lu <kjlu@umn.edu> |
| Date: Fri, 15 Mar 2019 02:11:56 -0500 |
| Subject: scsi: ufs: fix a missing check of devm_reset_control_get |
| |
| [ Upstream commit 63a06181d7ce169d09843645c50fea1901bc9f0a ] |
| |
| devm_reset_control_get could fail, so the fix checks its return value and |
| passes the error code upstream in case it fails. |
| |
| Signed-off-by: Kangjie Lu <kjlu@umn.edu> |
| Acked-by: Avri Altman <avri.altman@wdc.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/ufs/ufs-hisi.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/drivers/scsi/ufs/ufs-hisi.c b/drivers/scsi/ufs/ufs-hisi.c |
| index 0e855b5afe82a..2f592df921d97 100644 |
| --- a/drivers/scsi/ufs/ufs-hisi.c |
| +++ b/drivers/scsi/ufs/ufs-hisi.c |
| @@ -587,6 +587,10 @@ static int ufs_hisi_init_common(struct ufs_hba *hba) |
| ufshcd_set_variant(hba, host); |
| |
| host->rst = devm_reset_control_get(dev, "rst"); |
| + if (IS_ERR(host->rst)) { |
| + dev_err(dev, "%s: failed to get reset control\n", __func__); |
| + return PTR_ERR(host->rst); |
| + } |
| |
| ufs_hisi_set_pm_lvl(hba); |
| |
| -- |
| 2.20.1 |
| |
