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

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

Merge "msm: adsprpc: Remove remote mappings after PD is up"

parents 01a5cdef de445c06

drivers/char/adsprpc.c

+7 −7
Original line number Diff line number Diff line
@@ -2569,13 +2569,6 @@ static int fastrpc_mmap_remove_pdr(struct fastrpc_file *fl) 
			AUDIO_PDR_SERVICE_LOCATION_CLIENT_NAME, &session));

	if (err)

		goto bail;

	if (me->channel[fl->cid].spd[session].pdrcount !=

		me->channel[fl->cid].spd[session].prevpdrcount) {

		if (fastrpc_mmap_remove_ssr(fl))

			pr_err("ADSPRPC: SSR: Failed to unmap remote heap\n");

		me->channel[fl->cid].spd[session].prevpdrcount =

				me->channel[fl->cid].spd[session].pdrcount;

	}

	if (!me->channel[fl->cid].spd[session].ispdup) {

		VERIFY(err, 0);

		if (err) {
@@ -2583,6 +2576,13 @@ static int fastrpc_mmap_remove_pdr(struct fastrpc_file *fl) 
			goto bail;

		}

	}

	if (me->channel[fl->cid].spd[session].pdrcount !=

		me->channel[fl->cid].spd[session].prevpdrcount) {

		if (fastrpc_mmap_remove_ssr(fl))

			pr_err("ADSPRPC: SSR: Failed to unmap remote heap\n");

		me->channel[fl->cid].spd[session].prevpdrcount =

				me->channel[fl->cid].spd[session].pdrcount;

	}

bail:

	return err;

}