diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-16 07:20:28 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-16 07:20:28 +0000 |
| commit | 9391421406228d3f8ad65bcff5c1699527c34d60 (patch) | |
| tree | 9d37bf1041163dc1f4f67e864fce90afac991a2b | |
| parent | 167a7e0488d901e679bef1782a350eb935114f54 (diff) | |
| parent | 78ebe432701b713dc40fddf2236eebae4a781935 (diff) | |
| download | msm-9391421406228d3f8ad65bcff5c1699527c34d60.tar.gz | |
Merge cherrypicks of ['partner-android-review.googlesource.com/2660674'] into android13-msm-pixelwatch-5.15-eos-release.android-wear-13.0.0_r0.8android-wear-13.0.0_r0.10
Change-Id: I49d82a26cd75931b6e81e844a043def05ae17872
| -rw-r--r-- | drivers/char/adsprpc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c index dee23d97cba7..5319f1895fe2 100644 --- a/drivers/char/adsprpc.c +++ b/drivers/char/adsprpc.c @@ -5067,6 +5067,7 @@ int fastrpc_internal_mem_map(struct fastrpc_file *fl, int err = 0; struct fastrpc_mmap *map = NULL; + mutex_lock(&fl->internal_map_mutex); VERIFY(err, fl->dsp_proc_init == 1); if (err) { pr_err("adsprpc: ERROR: %s: user application %s trying to map without initialization\n", @@ -5105,6 +5106,7 @@ bail: mutex_unlock(&fl->map_mutex); } } + mutex_unlock(&fl->internal_map_mutex); return err; } @@ -5115,6 +5117,7 @@ int fastrpc_internal_mem_unmap(struct fastrpc_file *fl, struct fastrpc_mmap *map = NULL; size_t map_size = 0; + mutex_lock(&fl->internal_map_mutex); VERIFY(err, fl->dsp_proc_init == 1); if (err) { pr_err("adsprpc: ERROR: %s: user application %s trying to map without initialization\n", @@ -5161,6 +5164,7 @@ bail: mutex_unlock(&fl->map_mutex); } } + mutex_unlock(&fl->internal_map_mutex); return err; } |