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

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

Merge "USB: gadeget: ci13xxx: Before remote wake_up cancel suspend work"

parents b2ce9f40 2d78afab
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -1647,6 +1647,10 @@ static int ci13xxx_wakeup(struct usb_gadget *_gadget)
	}
	spin_unlock_irqrestore(udc->lock, flags);

	/* Make sure phy driver is done with its bus suspend handling */
	if (udc->udc_driver->cancel_pending_suspend)
		udc->udc_driver->cancel_pending_suspend(udc);

	if ((udc->udc_driver->in_lpm != NULL) &&
	    (udc->udc_driver->in_lpm(udc))) {
		if (udc->udc_driver->set_fpr_flag) {