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

This commit is contained in:
qctecmdr 2020-02-14 08:25:42 -08:00 • committed by Gerrit - the friendly Code Review server
commit 737f2f1603

View file

@ -3137,6 +3137,11 @@ static int fastrpc_mmap_remove_pdr(struct fastrpc_file *fl)
VERIFY(err, cid == fl->cid);
if (err)
goto bail;
if (!me->channel[fl->cid].spd[session].ispdup &&
me->channel[fl->cid].spd[session].pdrhandle) {
err = -ENOTCONN;
goto bail;
}
if (me->channel[fl->cid].spd[session].pdrcount !=
me->channel[fl->cid].spd[session].prevpdrcount) {
err = fastrpc_mmap_remove_ssr(fl);
@ -3146,11 +3151,6 @@ static int fastrpc_mmap_remove_pdr(struct fastrpc_file *fl)
me->channel[fl->cid].spd[session].prevpdrcount =
me->channel[fl->cid].spd[session].pdrcount;
}
if (!me->channel[fl->cid].spd[session].ispdup &&
me->channel[fl->cid].spd[session].pdrhandle) {
err = -ENOTCONN;
goto bail;
}
bail:
return err;
}