On 7/4/2020 2:50 AM, Martin Blumenstingl wrote:
Call dwc2_debugfs_exit() and dwc2_hcd_remove() (if the HCD was enabled earlier) when usb_add_gadget_udc() has failed. This ensures that the debugfs entries created by dwc2_debugfs_init() as well as the HCD are cleaned up in the error path.
Fixes: 207324a321a866 ("usb: dwc2: Postponed gadget registration to the udc class driver") Signed-off-by: Martin Blumenstingl martin.blumenstingl@googlemail.com
Acked-by: Minas Harutyunyan hminas@synopsys.com
Changes since v1 at [0]
- also cleanup the HCD as suggested by Minas (thank you!)
- updated the subject accordingly
[0] https://urldefense.com/v3/__https://patchwork.kernel.org/patch/11631381/__%3...
drivers/usb/dwc2/platform.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index c347d93eae64..9febae441069 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -582,12 +582,16 @@ static int dwc2_driver_probe(struct platform_device *dev) retval = usb_add_gadget_udc(hsotg->dev, &hsotg->gadget); if (retval) { dwc2_hsotg_remove(hsotg);
goto error_init;
} } #endif /* CONFIG_USB_DWC2_PERIPHERAL || CONFIG_USB_DWC2_DUAL_ROLE */ return 0;goto error_debugfs;
+error_debugfs:
- dwc2_debugfs_exit(hsotg);
- if (hsotg->hcd_enabled)
error_init: if (hsotg->params.activate_stm_id_vb_detection) regulator_disable(hsotg->usb33d);dwc2_hcd_remove(hsotg);