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

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

Merge "msm: sde: don't abort retired inline rotate requests"

parents 837d0cad 34079008

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

+4 −2
Original line number Diff line number Diff line
@@ -1731,6 +1731,7 @@ int sde_rotator_inline_commit(void *handle, struct sde_rotator_inline_cmd *cmd, 


		sde_rotator_req_finish(rot_dev->mgr, ctx->private, req);

		sde_rotator_retire_request(request);

		cmd->priv_handle = NULL;

	} else if (cmd_type == SDE_ROTATOR_INLINE_CMD_ABORT) {

		if (!cmd->priv_handle) {

			ret = -EINVAL;
@@ -1739,6 +1740,7 @@ int sde_rotator_inline_commit(void *handle, struct sde_rotator_inline_cmd *cmd, 
		}



		request = cmd->priv_handle;

		if (!sde_rotator_is_request_retired(request))

			sde_rotator_abort_inline_request(rot_dev->mgr,

					ctx->private, request->req);

	}