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

Commit 9bd99da5 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: Abort gating if clock on request is pending" into msm-4.9

parents 34c0f5b4 dd96ffa8

drivers/scsi/ufs/ufshcd.c

+1 −1
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ static void ufshcd_gate_work(struct work_struct *work) 
	 * state to CLKS_ON.

	 */

	if (hba->clk_gating.is_suspended ||

		(hba->clk_gating.state == REQ_CLKS_ON)) {

		(hba->clk_gating.state != REQ_CLKS_OFF)) {

		hba->clk_gating.state = CLKS_ON;

		trace_ufshcd_clk_gating(dev_name(hba->dev),

			hba->clk_gating.state);