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

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

Merge "i2c-msm-v2: disable clock after disabling IRQ"

parents 661be0a7 9b30a83e

drivers/i2c/busses/i2c-msm-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -3326,7 +3326,8 @@ static void i2c_msm_pm_xfer_end(struct i2c_msm_ctrl *ctrl) 
	struct i2c_msm_bam_pipe      *prod = &bam->pipe[I2C_MSM_BAM_PROD];

	struct i2c_msm_bam_pipe      *cons = &bam->pipe[I2C_MSM_BAM_CONS];



	/* efectively disabling our ISR */

	disable_irq(ctrl->rsrcs.irq);



	atomic_set(&ctrl->xfer.is_active, 0);



	if (cons->is_init)
@@ -3341,7 +3342,6 @@ static void i2c_msm_pm_xfer_end(struct i2c_msm_ctrl *ctrl) 
	} else {

		i2c_msm_pm_suspend(ctrl->dev);

	}

	disable_irq(ctrl->rsrcs.irq);

	mutex_unlock(&ctrl->xfer.mtx);

}