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

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

Merge "driver: soc: bam_dmux: Fix spinlock lock-up"

parents fd7dcefa ba8a674f

drivers/soc/qcom/bam_dmux.c

+11 −5
Original line number Diff line number Diff line
@@ -528,6 +528,8 @@ static void bam_mux_process_data(struct sk_buff *rx_skb) 
	struct bam_mux_hdr *rx_hdr;

	unsigned long event_data;

	uint8_t ch_id;

	void (*notify)(void *, int, unsigned long);

	void *priv;



	rx_hdr = (struct bam_mux_hdr *)rx_skb->data;

	ch_id = rx_hdr->ch_id;
@@ -540,15 +542,19 @@ static void bam_mux_process_data(struct sk_buff *rx_skb) 
	rx_skb->truesize = rx_hdr->pkt_len + sizeof(struct sk_buff);



	event_data = (unsigned long)(rx_skb);

	notify = NULL;

	priv = NULL;



	spin_lock_irqsave(&bam_ch[ch_id].lock, flags);

	if (bam_ch[ch_id].notify)

		bam_ch[ch_id].notify(

			bam_ch[ch_id].priv, BAM_DMUX_RECEIVE,

							event_data);

	if (bam_ch[ch_id].notify) {

		notify = bam_ch[ch_id].notify;

		priv = bam_ch[ch_id].priv;

	}

	spin_unlock_irqrestore(&bam_ch[ch_id].lock, flags);

	if (notify)

		notify(priv, BAM_DMUX_RECEIVE, event_data);

	else

		dev_kfree_skb_any(rx_skb);

	spin_unlock_irqrestore(&bam_ch[ch_id].lock, flags);



	queue_rx();

}