Merge "scsi: ufs: relocating power change routine" (0e195ef0) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/scsi/ufs/ufshcd.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3732,7 +3732,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)

		/* UniPro link is active now */
		ufshcd_set_link_active(hba);
		ufshcd_config_max_pwr_mode(hba);

		ret = ufshcd_verify_dev_init(hba);
		if (ret)
		@@ -3747,6 +3746,8 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
		ufshcd_force_reset_auto_bkops(hba);
		hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;

		ufshcd_config_max_pwr_mode(hba);

		/*
		* If we are in error handling context or in power management callbacks
		* context, no need to scan the host