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

This commit is contained in:
Linux Build Service Account 2017-10-05 03:06:45 -07:00 committed by Gerrit - the friendly Code Review server
commit abb2448f18

View file

@ -885,8 +885,9 @@ static void gsi_ctrl_clear_cpkt_queues(struct f_gsi *gsi, bool skip_req_q)
{
struct gsi_ctrl_pkt *cpkt = NULL;
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)
goto clean_resp_q;
@ -901,7 +902,7 @@ clean_resp_q:
list_del(&cpkt->list);
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)