From 6aecc4db618ab405bef52b2d27e8116342df9840 Mon Sep 17 00:00:00 2001 From: hgchu Date: Fri, 12 Jan 2018 14:47:16 +0900 Subject: [PATCH] scsi: ufs: change an order of vs resume and power control Change-Id: Ic608651530d6e3b92c0aafe4f03be95844b939c0 Signed-off-by: hgchu --- drivers/scsi/ufs/ufshcd.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 0f7c233d936e..9a671dbc5084 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7692,12 +7692,6 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) ufshcd_hba_vreg_set_hpm(hba); - - /* enable the host irq as host controller would be active soon */ - ret = ufshcd_enable_irq(hba); - if (ret) - goto disable_irq_and_vops_clks; - ret = ufshcd_vreg_set_hpm(hba); if (ret) goto disable_irq_and_vops_clks; @@ -7766,13 +7760,13 @@ set_old_link_state: ufshcd_link_state_transition(hba, old_link_state, 0); vendor_suspend: ufshcd_vops_suspend(hba, pm_op); -disable_vreg: - ufshcd_vreg_set_lpm(hba); disable_irq_and_vops_clks: ufshcd_disable_irq(hba); if (hba->clk_scaling.is_allowed) ufshcd_suspend_clkscaling(hba); ufshcd_setup_clocks(hba, false); +disable_vreg: + ufshcd_vreg_set_lpm(hba); out: hba->pm_op_in_progress = 0; return ret; -- 2.20.1