summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-26 08:59:32 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-26 08:59:32 +0200
commitc1aa67729a1d94373fb9826fef97b8a2b7f2e00f (patch)
tree00d35bd3a40530c43f17e5ec91223e494770068d
parentb76032396d7958f006bccf5fb2535beb5526837c (diff)
parent991d5add50a5bb6ab8f12f2129f5c7487f6baaf6 (diff)
Merge tag 'usb-ci-v4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-linus
Peter writes: Fix for kernel panic during the system reboot for some boards
-rw-r--r--drivers/usb/chipidea/host.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 96ae69502c86..111b0e0b8698 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -188,6 +188,8 @@ static void host_stop(struct ci_hdrc *ci)
if (hcd) {
usb_remove_hcd(hcd);
+ ci->role = CI_ROLE_END;
+ synchronize_irq(ci->irq);
usb_put_hcd(hcd);
if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode(ci) &&
(ci->platdata->flags & CI_HDRC_TURN_VBUS_EARLY_ON))