From: Dov Levenglick <dovl@codeaurora.org>
Date: Tue, 18 Oct 2016 00:10:14 +0000 (-0700)
Subject: scsi: ufs: fail ufshcd_probe_hba() if power configuration fails
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8643ae66ce749f63ea0de928f5059b7b5f8b30cd;p=openwrt%2Fstaging%2Fblogic.git

scsi: ufs: fail ufshcd_probe_hba() if power configuration fails

In case the power configuration fails, skip further processing of the
probing function and return immediately. This has 2 reasons:

1. Don't allow the UFS to continue running in PWM

2. Avoid multiple calls to pm_runtime_put_sync() when not in error
   handling or power management contexts

Signed-off-by: Dov Levenglick <dovl@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 93e2fe82822f..d2930fb8b446 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -5051,9 +5051,11 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
 			__func__);
 	} else {
 		ret = ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info);
-		if (ret)
+		if (ret) {
 			dev_err(hba->dev, "%s: Failed setting power mode, err = %d\n",
 					__func__, ret);
+			goto out;
+		}
 	}
 
 	/* set the state as operational after switching to desired gear */