Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1846a103 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: suspend clock scaling for failed runtime_resume"

parents 94893df3 5eb07413

drivers/scsi/ufs/ufshcd.c

+3 −0
Original line number Diff line number Diff line
@@ -7019,6 +7019,7 @@ static void ufshcd_hba_exit(struct ufs_hba *hba) 
	if (hba->is_powered) {

		ufshcd_variant_hba_exit(hba);

		ufshcd_setup_vreg(hba, false);

		ufshcd_suspend_clkscaling(hba);

		ufshcd_setup_clocks(hba, false);

		ufshcd_setup_hba_vreg(hba, false);

		hba->is_powered = false;
@@ -7349,6 +7350,7 @@ vops_resume: 
	if (hba->vops && hba->vops->resume)

		hba->vops->resume(hba, pm_op);

set_link_active:

	ufshcd_resume_clkscaling(hba);

	ufshcd_vreg_set_hpm(hba);

	if (ufshcd_is_link_hibern8(hba) && !ufshcd_uic_hibern8_exit(hba)) {

		ufshcd_set_link_active(hba);
@@ -7485,6 +7487,7 @@ disable_vreg: 
	ufshcd_vreg_set_lpm(hba);

disable_irq_and_vops_clks:

	ufshcd_disable_irq(hba);

	ufshcd_suspend_clkscaling(hba);

	ufshcd_setup_clocks(hba, false);

out:

	hba->pm_op_in_progress = 0;