Merge "scsi: ufs: Disable irq before turning off clocks in suspend path" (7e711cbf) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/scsi/ufs/ufshcd.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -10698,6 +10698,12 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
		if (ret)
		goto set_link_active;

		/*
		* Disable the host irq as host controller as there won't be any
		* host controller transaction expected till resume.
		*/
		ufshcd_disable_irq(hba);

		if (!ufshcd_is_link_active(hba))
		ret = ufshcd_disable_clocks(hba, false);
		else
		@@ -10714,16 +10720,13 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
		trace_ufshcd_clk_gating(dev_name(hba->dev),
		hba->clk_gating.state);
		}
		/*
		* Disable the host irq as host controller as there won't be any
		* host controller transaction expected till resume.
		*/
		ufshcd_disable_irq(hba);

		/* Put the host controller in low power mode if possible */
		ufshcd_hba_vreg_set_lpm(hba);
		goto out;

		set_link_active:
		ufshcd_enable_irq(hba);
		if (hba->clk_scaling.is_allowed)
		ufshcd_resume_clkscaling(hba);
		ufshcd_vreg_set_hpm(hba);