Merge "scsi: ufs: enable auto hibern8 only after device initialization" (29674d74) · Commits · e / devices / android_kernel_sony_msm8998

drivers/scsi/ufs/ufshcd.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -7008,11 +7008,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
		if (ret)
		goto out;

		/* Enable auto hibern8 if supported */
		if (ufshcd_is_auto_hibern8_supported(hba))
		ufshcd_set_auto_hibern8_timer(hba,
		hba->hibern8_on_idle.delay_ms);

		/* Debug counters initialization */
		ufshcd_clear_dbg_ufs_stats(hba);
		/* set the default level for urgent bkops */
		@@ -7079,6 +7074,13 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
		if (ufshcd_scsi_add_wlus(hba))
		goto out;

		/* Enable auto hibern8 if supported, after full host and
		* device initialization.
		*/
		if (ufshcd_is_auto_hibern8_supported(hba))
		ufshcd_set_auto_hibern8_timer(hba,
		hba->hibern8_on_idle.delay_ms);

		/* Initialize devfreq after UFS device is detected */
		if (ufshcd_is_clkscaling_supported(hba)) {
		memcpy(&hba->clk_scaling.saved_pwr_info.info,