evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ipa: fix mutex_lock with task->state != RUNNING"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-17 06:08:08 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1ece543f8b
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/platform/msm/ipa/ipa_v2/ipa_intf.c
View file

@ -523,10 +523,9 @@ ssize_t ipa_read(struct file *filp, char __user *buf, size_t count,
start = buf;
while (1) {
prepare_to_wait(&ipa_ctx->msg_waitq, &wait, TASK_INTERRUPTIBLE);
mutex_lock(&ipa_ctx->msg_lock);
locked = 1;
prepare_to_wait(&ipa_ctx->msg_waitq, &wait, TASK_INTERRUPTIBLE);
if (!list_empty(&ipa_ctx->msg_list)) {
msg = list_first_entry(&ipa_ctx->msg_list,
struct ipa_push_msg, link);

4
drivers/platform/msm/ipa/ipa_v3/ipa_intf.c
View file

@ -528,12 +528,12 @@ ssize_t ipa3_read(struct file *filp, char __user *buf, size_t count,
start = buf;
while (1) {
mutex_lock(&ipa3_ctx->msg_lock);
locked = 1;
prepare_to_wait(&ipa3_ctx->msg_waitq,
&wait,
TASK_INTERRUPTIBLE);
mutex_lock(&ipa3_ctx->msg_lock);
locked = 1;
if (!list_empty(&ipa3_ctx->msg_list)) {
msg = list_first_entry(&ipa3_ctx->msg_list,
struct ipa3_push_msg, link);