Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "dsp: unlock the mutex before return to avoid potential deadlock"

Browse source
This commit is contained in:
Linux Build Service Account 2017-12-12 09:56:53 -08:00 • committed by Gerrit - the friendly Code Review server
commit 6d3d8cf5e5
1 changed files with 1 additions and 3 deletions

4
dsp/q6asm.c
View file

@ -3541,7 +3541,6 @@ int q6asm_set_shared_circ_buff(struct audio_client *ac,
if (ac->port[dir].buf) {
pr_err("%s: Buffer already allocated\n", __func__);
rc = -EINVAL;
mutex_unlock(&ac->cmd_lock);
goto done;
}
@ -3564,7 +3563,6 @@ int q6asm_set_shared_circ_buff(struct audio_client *ac,
pr_err("%s: Audio ION alloc is failed, rc = %d\n", __func__,
rc);
kfree(buf_circ);
mutex_unlock(&ac->cmd_lock);
goto done;
}
@ -3590,8 +3588,8 @@ int q6asm_set_shared_circ_buff(struct audio_client *ac,
msm_audio_populate_upper_32_bits(buf_circ->phys);
open->map_region_circ_buf.mem_size_bytes = bytes_to_alloc;
mutex_unlock(&ac->cmd_lock);
done:
mutex_unlock(&ac->cmd_lock);
return rc;
}