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

Commit 7ca4537e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: cdev: Fix spinlock recursion"

parents cad1e331 fe41aca1

drivers/usb/gadget/function/f_cdev.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1679,6 +1679,7 @@ static void usb_cser_notify_modem(void *fport, int ctrl_bits) 
	spin_lock_irqsave(&port->port_lock, flags);

	spin_lock_irqsave(&port->port_lock, flags);

	port->cbits_to_modem = temp;

	port->cbits_to_modem = temp;

	port->cbits_updated = true;

	port->cbits_updated = true;

	spin_unlock_irqrestore(&port->port_lock, flags);





	 /* if DTR is high, update latest modem info to laptop */

	 /* if DTR is high, update latest modem info to laptop */

	if (port->cbits_to_modem & TIOCM_DTR) {

	if (port->cbits_to_modem & TIOCM_DTR) {
@@ -1691,7 +1692,6 @@ static void usb_cser_notify_modem(void *fport, int ctrl_bits) 
			cser->send_modem_ctrl_bits(cser, cbits_to_laptop);

			cser->send_modem_ctrl_bits(cser, cbits_to_laptop);

	}

	}





	spin_unlock_irqrestore(&port->port_lock, flags);

	wake_up(&port->read_wq);

	wake_up(&port->read_wq);

}

}