[PATCH] usb: dwc3: Fix error handling for core init

[PATCH] usb: dwc3: Fix error handling for core init

[Vivek Gautam]

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

Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
---

Based on usb-next.

 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

Re: [PATCH] usb: dwc3: Fix error handling for core init

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 429 bytes --]


Hi,

Vivek Gautam <vivek.gautam@codeaurora.org> writes:
> Fixing the sequence of events in dwc3_core_init() error exit path.
> dwc3_core_exit() call is removed from the error path since,
> whatever it's doing is already done.
>
> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
> Cc: Felipe Balbi <felipe.balbi@linux.intel.com>

Care to blame the original commit and Cc stable if applicable?

-- 
balbi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]

Re: [PATCH] usb: dwc3: Fix error handling for core init

[Vivek Gautam]

Hi,


On Fri, Oct 21, 2016 at 3:45 PM, Felipe Balbi <balbi@kernel.org> wrote:
>
> Hi,
>
> Vivek Gautam <vivek.gautam@codeaurora.org> writes:
>> Fixing the sequence of events in dwc3_core_init() error exit path.
>> dwc3_core_exit() call is removed from the error path since,
>> whatever it's doing is already done.
>>
>> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
>> Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
>
> Care to blame the original commit and Cc stable if applicable?

Ok, will do that.


Thanks
Vivek


-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH v2] usb: dwc3: Fix error handling for core init

[Vivek Gautam]

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@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>
---

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