leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'usb-ci-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Browse Source 
Peter writes:

One patch to improve error handling at chipidea core
This commit is contained in:
Greg Kroah-Hartman
2017-06-27 17:35:31 +02:00
parent 9c691cc9f8 c4a0bbbdb7
commit 6e5c7514e7
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/usb/chipidea/core.c
View File

@@ -818,7 +818,7 @@ static inline void ci_role_destroy(struct ci_hdrc *ci)
{ {
ci_hdrc_gadget_destroy(ci); ci_hdrc_gadget_destroy(ci);
ci_hdrc_host_destroy(ci); ci_hdrc_host_destroy(ci);
if (ci->is_otg) if (ci->is_otg && ci->roles[CI_ROLE_GADGET])
ci_hdrc_otg_destroy(ci); ci_hdrc_otg_destroy(ci);
} }
@@ -980,27 +980,35 @@ static int ci_hdrc_probe(struct platform_device *pdev)
/* initialize role(s) before the interrupt is requested */ /* initialize role(s) before the interrupt is requested */
if (dr_mode == USB_DR_MODE_OTG || dr_mode == USB_DR_MODE_HOST) { if (dr_mode == USB_DR_MODE_OTG || dr_mode == USB_DR_MODE_HOST) {
ret = ci_hdrc_host_init(ci); ret = ci_hdrc_host_init(ci);
if (ret) if (ret) {
if (ret == -ENXIO)
dev_info(dev, "doesn't support host\n"); dev_info(dev, "doesn't support host\n");
else
goto deinit_phy;
}
} }
if (dr_mode == USB_DR_MODE_OTG || dr_mode == USB_DR_MODE_PERIPHERAL) { if (dr_mode == USB_DR_MODE_OTG || dr_mode == USB_DR_MODE_PERIPHERAL) {
ret = ci_hdrc_gadget_init(ci); ret = ci_hdrc_gadget_init(ci);
if (ret) if (ret) {
if (ret == -ENXIO)
dev_info(dev, "doesn't support gadget\n"); dev_info(dev, "doesn't support gadget\n");
else
goto deinit_host;
}
} }
if (!ci->roles[CI_ROLE_HOST] && !ci->roles[CI_ROLE_GADGET]) { if (!ci->roles[CI_ROLE_HOST] && !ci->roles[CI_ROLE_GADGET]) {
dev_err(dev, "no supported roles\n"); dev_err(dev, "no supported roles\n");
ret = -ENODEV; ret = -ENODEV;
goto deinit_phy; goto deinit_gadget;
} }
if (ci->is_otg && ci->roles[CI_ROLE_GADGET]) { if (ci->is_otg && ci->roles[CI_ROLE_GADGET]) {
ret = ci_hdrc_otg_init(ci); ret = ci_hdrc_otg_init(ci);
if (ret) { if (ret) {
dev_err(dev, "init otg fails, ret = %d\n", ret); dev_err(dev, "init otg fails, ret = %d\n", ret);
goto stop; goto deinit_gadget;
} }
} }
@@ -1070,7 +1078,12 @@ static int ci_hdrc_probe(struct platform_device *pdev)
remove_debug: remove_debug:
dbg_remove_files(ci); dbg_remove_files(ci);
stop: stop:
ci_role_destroy(ci); if (ci->is_otg && ci->roles[CI_ROLE_GADGET])
ci_hdrc_otg_destroy(ci);
deinit_gadget:
ci_hdrc_gadget_destroy(ci);
deinit_host:
ci_hdrc_host_destroy(ci);
deinit_phy: deinit_phy:
ci_usb_phy_exit(ci); ci_usb_phy_exit(ci);
ulpi_exit: ulpi_exit: