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

Commit 3b5766a8 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: adsprpc: print remote process kill failure message"

parents 96e82290 2abc9ca4

drivers/char/adsprpc.c

+11 −3
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static int fastrpc_mmap_create(struct fastrpc_file *fl, int fd, 
	struct fastrpc_session_ctx *sess;

	struct fastrpc_apps *apps = fl->apps;

	int cid = fl->cid;

	struct fastrpc_channel_ctx *chan = &apps->channel[cid];

	struct fastrpc_channel_ctx *chan = NULL;

	struct fastrpc_mmap *map = NULL;

	dma_addr_t region_phys = 0;

	void *region_vaddr = NULL;
@@ -768,6 +768,11 @@ static int fastrpc_mmap_create(struct fastrpc_file *fl, int fd, 
	int err = 0, vmid, sgl_index = 0;

	struct scatterlist *sgl = NULL;



	VERIFY(err, cid >= 0 && cid < NUM_CHANNELS);

	if (err)

		goto bail;

	chan = &apps->channel[cid];



	if (!fastrpc_mmap_find(fl, fd, va, len, mflags, 1, ppmap))

		return 0;

	map = kzalloc(sizeof(*map), GFP_KERNEL);
@@ -2784,13 +2789,16 @@ static int fastrpc_file_free(struct fastrpc_file *fl) 
	struct hlist_node *n = NULL;

	struct fastrpc_mmap *map = NULL, *lmap = NULL;

	struct fastrpc_perf *perf = NULL, *fperf = NULL;

	int cid;

	int cid, err = 0;



	if (!fl)

		return 0;

	cid = fl->cid;



	(void)fastrpc_release_current_dsp_process(fl);

	err = fastrpc_release_current_dsp_process(fl);

	if (err)

		pr_err("adsprpc: %s: releasing DSP process failed for %s, returned 0x%x",

					__func__, current->comm, err);



	spin_lock(&fl->apps->hlock);

	hlist_del_init(&fl->hn);