Merge "msm: sde: fix compiler error on hw timestamp update" (9874e32b) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2950,7 +2950,7 @@ static int sde_hw_rotator_abort_kickoff(struct sde_rot_hw_resource *hw,
		}

		spin_lock_irqsave(&rot->rotisr_lock, flags);
		sde_hw_rotator_update_swts(rot, ctx, ctx->timestamp);
		rot->ops.update_ts(rot, ctx->q_id, ctx->timestamp);
		ctx->abort = true;
		wake_up_all(&ctx->regdma_waitq);
		spin_unlock_irqrestore(&rot->rotisr_lock, flags);