Patch "usb: chipidea: properly handle host or gadget initialization failure" has been added to the 3.18-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
usb: chipidea: properly handle host or gadget initialization failure
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-chipidea-properly-handle-host-or-gadget-initialization-failure.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Apr 10 13:58:07 CEST 2018
From: Jisheng Zhang <[email protected]>
Date: Wed, 26 Apr 2017 16:59:34 +0800
Subject: usb: chipidea: properly handle host or gadget initialization failure
From: Jisheng Zhang <[email protected]>
[ Upstream commit c4a0bbbdb7f6e3c37fa6deb3ef28c5ed99da6175 ]
If ci_hdrc_host_init() or ci_hdrc_gadget_init() returns error and the error != -ENXIO, as Peter pointed out, "it stands for initialization for host or gadget has failed", so we'd better return failure rather continue.
And before destroying the otg, i.e ci_hdrc_otg_destroy(ci), we should also check ci->roles[CI_ROLE_GADGET].
--- drivers/usb/chipidea/core.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/usb/chipidea/core.c +21 -8
@@ -553,7 +553,7 @@ static inline void ci_role_destroy(struc {ci_hdrc_gadget_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); }
@@ -653,20 +653,28 @@ static int ci_hdrc_probe(struct platform/* initialize role(s) before the interrupt is requested */ if (dr_mode ==USB_DR_MODE_OTG || dr_mode ==USB_DR_MODE_HOST ) { ret =ci_hdrc_host_init (ci); -if (ret) -dev_info (dev,"doesn't support host\n" ); +if (ret) { +if (ret == -ENXIO ) +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 ) { ret =ci_hdrc_gadget_init (ci); -if (ret) -dev_info (dev,"doesn't support gadget\n" ); +if (ret) { +if (ret == -ENXIO ) +dev_info (dev,"doesn't support gadget\n" ); +else + goto deinit_host; + } }if (!ci->roles[CI_ROLE_HOST ] && !ci->roles[CI_ROLE_GADGET ]) {dev_err (dev,"no supported roles\n" ); ret = -ENODEV ; - goto deinit_phy; + goto deinit_gadget; }if (ci->is_otg && ci->roles[CI_ROLE_GADGET ]) {
@@ -676,7 +684,7 @@ static int ci_hdrc_probe(struct platform ret =ci_hdrc_otg_init (ci);if (ret) {dev_err (dev,"init otg fails, ret = %d\n" , ret); - goto stop; + goto deinit_gadget; } }
@@ -727,7 +735,12 @@ static int ci_hdrc_probe(struct platformfree_irq (ci->irq, ci); 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:usb_phy_shutdown (ci->transceiver);
Patches currently in stable-queue which might be from [email protected] are
queue-3.18/usb-chipidea-properly-handle-host-or-gadget-initialization-failure.patch