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

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

Merge "msm: ADSPRPC: Queue one more intent to avoid race condition"

parents f61a791d d78cfa23

drivers/char/adsprpc.c

+10 −3
Original line number Diff line number Diff line
@@ -2502,9 +2502,16 @@ static int fastrpc_channel_open(struct fastrpc_file *fl) 
		kref_init(&me->channel[cid].kref);

		pr_info("'opened /dev/%s c %d %d'\n", gcinfo[cid].name,

						MAJOR(me->dev_no), cid);

		err = glink_queue_rx_intent(me->channel[cid].chan, NULL, 64);



		if (me->glink) {

			err = glink_queue_rx_intent(me->channel[cid].chan,

							NULL, 16);

			err |= glink_queue_rx_intent(me->channel[cid].chan,

							 NULL, 64);

			if (err)

			pr_info("adsprpc: initial intent failed for %d\n", cid);

				pr_warn("adsprpc: intent fail for %d err %d\n",

						cid, err);

		}

		if (cid == 0 && me->channel[cid].ssrcount !=

				 me->channel[cid].prevssrcount) {

			if (fastrpc_mmap_remove_ssr(fl))