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

Commit 1ece543f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents cd6936ba 21fab3e7

drivers/platform/msm/ipa/ipa_v2/ipa_intf.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

drivers/platform/msm/ipa/ipa_v3/ipa_intf.c

+2 −2
Original line number Diff line number Diff line
@@ -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);