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

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

Merge "spcom: avoid using stale glink handle"

parents 5e5e9ce0 0b8481af

drivers/soc/qcom/spcom.c

+5 −9
Original line number Diff line number Diff line
@@ -493,13 +493,10 @@ static void spcom_notify_state(void *handle, const void *priv, 


		ch->glink_state = event;



		/*

		 * if spcom_notify_state() is called within glink_open()

		 * then ch->glink_handle is not updated yet.

		 */

		if (!ch->glink_handle) {

			pr_debug("update glink_handle, ch [%s].\n", ch->name);

			ch->glink_handle = handle;

		if (!handle) {

			pr_err("inavlid glink_handle, ch [%s].\n", ch->name);

			mutex_unlock(&ch->lock);

			return;

		}



		/* signal before unlock mutex & before calling glink */
@@ -512,8 +509,7 @@ static void spcom_notify_state(void *handle, const void *priv, 
		 */



		pr_debug("call glink_queue_rx_intent() ch [%s].\n", ch->name);

		ret = glink_queue_rx_intent(ch->glink_handle,

					    ch, ch->rx_buf_size);

		ret = glink_queue_rx_intent(handle, ch, ch->rx_buf_size);

		if (ret) {

			pr_err("glink_queue_rx_intent() err [%d]\n", ret);

		} else {