Merge "msm: adsprpc: Free dma handles in RPC call with no parameters" (0808dffa) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/char/adsprpc.c

+11 −15

Original line number	Diff line number	Diff line
		@@ -2562,7 +2562,6 @@ static int put_args(uint32_t kernel, struct smq_invoke_ctx *ctx,
		}
		}
		mutex_lock(&ctx->fl->map_mutex);
		if (inbufs + outbufs + handles) {
		for (i = 0; i < M_FDLIST; i++) {
		if (!fdlist[i])
		break;
		@@ -2570,7 +2569,6 @@ static int put_args(uint32_t kernel, struct smq_invoke_ctx *ctx,
		0, 0, &mmap))
		fastrpc_mmap_free(mmap, 0);
		}
		}
		mutex_unlock(&ctx->fl->map_mutex);
		if (ctx->crc && crclist && rpra)
		K_COPY_TO_USER(err, kernel, ctx->crc,
		@@ -2981,13 +2979,11 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode,
		if (err)
		goto bail;
		isasyncinvoke = (ctx->asyncjob.isasyncjob ? true : false);
		if (REMOTE_SCALARS_LENGTH(ctx->sc)) {
		PERF(fl->profile, GET_COUNTER(perf_counter, PERF_GETARGS),
		VERIFY(err, 0 == (err = get_args(kernel, ctx)));
		PERF_END);
		if (err)
		goto bail;
		}

		PERF(fl->profile, GET_COUNTER(perf_counter, PERF_INVARGS),
		inv_args(ctx);