Commit 8643ae66 authored Oct 17, 2016 by Dov Levenglick Committed by Martin K. Petersen Nov 08, 2016

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>

parent a508253d

drivers/scsi/ufs/ufshcd.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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 */