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

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

Merge "usb: gadget: gsi: Avoid spinlock lockup"

parents 2130b88e 92afedd6

drivers/usb/gadget/function/f_gsi.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1279,8 +1279,9 @@ static void gsi_ctrl_clear_cpkt_queues(struct f_gsi *gsi, bool skip_req_q) 
{

{

	struct gsi_ctrl_pkt *cpkt = NULL;

	struct gsi_ctrl_pkt *cpkt = NULL;

	struct list_head *act, *tmp;

	struct list_head *act, *tmp;

	unsigned long flags;





	spin_lock(&gsi->c_port.lock);

	spin_lock_irqsave(&gsi->c_port.lock, flags);

	if (skip_req_q)

	if (skip_req_q)

		goto clean_resp_q;

		goto clean_resp_q;
@@ -1295,7 +1296,7 @@ clean_resp_q: 
		list_del(&cpkt->list);

		list_del(&cpkt->list);

		gsi_ctrl_pkt_free(cpkt);

		gsi_ctrl_pkt_free(cpkt);

	}

	}

	spin_unlock(&gsi->c_port.lock);

	spin_unlock_irqrestore(&gsi->c_port.lock, flags);

}

}





static int gsi_ctrl_send_cpkt_tomodem(struct f_gsi *gsi, void *buf, size_t len)

static int gsi_ctrl_send_cpkt_tomodem(struct f_gsi *gsi, void *buf, size_t len)