diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-26 08:59:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-26 08:59:32 +0200 |
| commit | c1aa67729a1d94373fb9826fef97b8a2b7f2e00f (patch) | |
| tree | 00d35bd3a40530c43f17e5ec91223e494770068d | |
| parent | usb: renesas_usbhs: add wait after initialization for R-Car Gen3 (diff) | |
| parent | usb: chipidea: host: fix NULL ptr dereference during shutdown (diff) | |
| download | linux-c1aa67729a1d94373fb9826fef97b8a2b7f2e00f.tar.xz linux-c1aa67729a1d94373fb9826fef97b8a2b7f2e00f.zip | |
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.c | 2 |
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)) |