UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: dwc2: rework initialization of host and gadget in dual-role mode 

If device is configured to work only in HOST or DEVICE mode, there is
no point in initializing both subdrivers. This patch also fixes
resource leakage if host subdriver fails to initialize.

Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Marek Szyprowski 2015-03-10 13:41:10 +01:00 committed by Felipe Balbi
parent 9024c495f3
commit e39af88f18
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/dwc2/core.h
View File

@ -593,6 +593,8 @@ struct dwc2_hsotg {
struct dwc2_core_params *core_params; struct dwc2_core_params *core_params;
enum usb_otg_state op_state; enum usb_otg_state op_state;
enum usb_dr_mode dr_mode; enum usb_dr_mode dr_mode;
unsigned int hcd_enabled:1;
unsigned int gadget_enabled:1;
struct phy *phy; struct phy *phy;
struct usb_phy *uphy; struct usb_phy *uphy;

29
drivers/usb/dwc2/platform.c
View File

@ -121,8 +121,10 @@ static int dwc2_driver_remove(struct platform_device *dev)
{ {
struct dwc2_hsotg *hsotg = platform_get_drvdata(dev); struct dwc2_hsotg *hsotg = platform_get_drvdata(dev);
dwc2_hcd_remove(hsotg); if (hsotg->hcd_enabled)
s3c_hsotg_remove(hsotg); dwc2_hcd_remove(hsotg);
if (hsotg->gadget_enabled)
s3c_hsotg_remove(hsotg);
return 0; return 0;
} }
@ -234,12 +236,23 @@ static int dwc2_driver_probe(struct platform_device *dev)
spin_lock_init(&hsotg->lock); spin_lock_init(&hsotg->lock);
mutex_init(&hsotg->init_mutex); mutex_init(&hsotg->init_mutex);
retval = dwc2_gadget_init(hsotg, irq);
if (retval) if (hsotg->dr_mode != USB_DR_MODE_HOST) {
return retval; retval = dwc2_gadget_init(hsotg, irq);
retval = dwc2_hcd_init(hsotg, irq, params); if (retval)
if (retval) return retval;
return retval; hsotg->gadget_enabled = 1;
}
if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) {
retval = dwc2_hcd_init(hsotg, irq, params);
if (retval) {
if (hsotg->gadget_enabled)
s3c_hsotg_remove(hsotg);
return retval;
}
hsotg->hcd_enabled = 1;
}
platform_set_drvdata(dev, hsotg); platform_set_drvdata(dev, hsotg);