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

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

Merge "soc: qcom: glink_smem: Add block_signal flag to tx_wakeup"

parents 7a531331 a95d897e
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -907,8 +907,7 @@ static void tx_wakeup_worker(struct edge_info *einfo)
			einfo->tx_resume_needed = false;
			trigger_resume = true;
		}
	}
	if (waitqueue_active(&einfo->tx_blocked_queue)) { /* tx waiting ?*/
		if (waitqueue_active(&einfo->tx_blocked_queue))/* tx waiting ?*/
			trigger_wakeup = true;
	}
	spin_unlock_irqrestore(&einfo->write_lock, flags);
@@ -963,8 +962,9 @@ static void __rx_worker(struct edge_info *einfo, bool atomic_ctx)
		einfo->xprt_if.glink_core_if_ptr->link_up(&einfo->xprt_if);
	}

	if ((atomic_ctx) && ((einfo->tx_resume_needed) ||
		(waitqueue_active(&einfo->tx_blocked_queue)))) /* tx waiting ?*/
	if ((atomic_ctx) && ((einfo->tx_resume_needed)
	    || (einfo->tx_blocked_signal_sent)
	    || (waitqueue_active(&einfo->tx_blocked_queue)))) /* tx waiting ?*/
		tx_wakeup_worker(einfo);

	/*