Commit 9b9d7cdd authored Oct 21, 2016 by Vivek Gautam Committed by Felipe Balbi Oct 31, 2016

usb: dwc3: Fix error handling for core init

Fixing the sequence of events in dwc3_core_init() error exit path.
dwc3_core_exit() call is also removed from the error path since,
whatever it's doing is already done.

Fixes: c499ff71 usb: dwc3: core: re-factor init and exit paths

Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Stable <stable@vger.kernel.org> # 4.8+
Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

parent a909d3e6

drivers/usb/dwc3/core.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -769,15 +769,14 @@ static int dwc3_core_init(struct dwc3 *dwc)
		return 0;

		err4:
		phy_power_off(dwc->usb2_generic_phy);
		phy_power_off(dwc->usb3_generic_phy);

		err3:
		phy_power_off(dwc->usb3_generic_phy);
		phy_power_off(dwc->usb2_generic_phy);

		err2:
		usb_phy_set_suspend(dwc->usb2_phy, 1);
		usb_phy_set_suspend(dwc->usb3_phy, 1);
		dwc3_core_exit(dwc);

		err1:
		usb_phy_shutdown(dwc->usb2_phy);