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

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

Merge "msm: ADSPRPC: Do not release rpc session when interrupted"

parents b84a0e2d a30d8d04

drivers/char/adsprpc.c

+4 −5
Original line number Diff line number Diff line
@@ -843,8 +843,8 @@ static int fastrpc_internal_invoke(struct fastrpc_apps *me, uint32_t mode, 
		goto bail;

	if (FASTRPC_MODE_PARALLEL == mode)

		inv_args(sc, rpra, obuf.used);

	VERIFY(err, 0 == (interrupted =

			wait_for_completion_interruptible(&ctx->work)));

	interrupted = wait_for_completion_interruptible(&ctx->work);

	VERIFY(err, 0 == (err = interrupted));

	if (err)

		goto bail;

	VERIFY(err, 0 == (err = ctx->retval));
@@ -855,8 +855,7 @@ static int fastrpc_internal_invoke(struct fastrpc_apps *me, uint32_t mode, 
		goto bail;

 bail:

	if (interrupted) {

		if (!kernel)

			(void)fastrpc_release_current_dsp_process();

		if (kernel)

			wait_for_completion(&ctx->work);

	}

	context_free(ctx);