[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <1477047067-32265-1-git-send-email-vivek.gautam@codeaurora.org>
Date: Fri, 21 Oct 2016 16:21:07 +0530
From: Vivek Gautam <vivek.gautam@...eaurora.org>
To: balbi@...nel.org, gregkh@...uxfoundation.org
Cc: linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
Vivek Gautam <vivek.gautam@...eaurora.org>,
Felipe Balbi <felipe.balbi@...ux.intel.com>,
Stable <stable@...r.kernel.org>
Subject: [PATCH v2] 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: c499ff7 usb: dwc3: core: re-factor init and exit paths
Cc: Felipe Balbi <felipe.balbi@...ux.intel.com>
Cc: Greg KH <gregkh@...uxfoundation.org>
Cc: Stable <stable@...r.kernel.org> # 4.8+
Signed-off-by: Vivek Gautam <vivek.gautam@...eaurora.org>
---
Based on usb-next.
Build tested.
Changes since v1:
- Added reference to original commit that this patch fixes.
- CC'ed kernel stable.
drivers/usb/dwc3/core.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 7287a76..fea4469 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -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);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Powered by blists - more mailing lists