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

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

Merge "usb: dwc3: gadget: Replace dev with its parent sysdev in ep_disable"

parents 260366e0 7afb83d9

drivers/usb/dwc3/gadget.c

+9 −0
Original line number Diff line number Diff line
@@ -1012,6 +1012,12 @@ static int dwc3_gadget_ep_enable(struct usb_ep *ep, 
					dep->name))

		return 0;



	if (pm_runtime_suspended(dwc->sysdev)) {

		dev_err(dwc->dev, "fail ep_enable %s device is into LPM\n",

					dep->name);

		return -EINVAL;

	}



	spin_lock_irqsave(&dwc->lock, flags);

	ret = __dwc3_gadget_ep_enable(dep, DWC3_DEPCFG_ACTION_INIT);

	dbg_event(dep->number, "ENABLE", ret);
@@ -1040,10 +1046,13 @@ static int dwc3_gadget_ep_disable(struct usb_ep *ep) 
					dep->name))

		return 0;



	pm_runtime_get_sync(dwc->sysdev);

	spin_lock_irqsave(&dwc->lock, flags);

	ret = __dwc3_gadget_ep_disable(dep);

	dbg_event(dep->number, "DISABLE", ret);

	spin_unlock_irqrestore(&dwc->lock, flags);

	pm_runtime_mark_last_busy(dwc->sysdev);

	pm_runtime_put_sync_autosuspend(dwc->sysdev);



	return ret;

}