diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-07-08 18:12:13 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-07-12 10:57:29 +0200 |
| commit | bf47d8537eef13879c1814b210bf714917687574 (patch) | |
| tree | b8b01ec15498e317b10b1d0bab9f80ecb85fdd73 /drivers/usb/core/hub.c | |
| parent | 774f42075a4800fe4106dffca804e3207bc3c2e7 (diff) | |
| parent | a74d0e937a3acaea08ec0a7bfa047b8e0a6b6303 (diff) | |
Merge tag 'v4.14.126' into 4.14-2.0.x-imx
This is the 4.14.126 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Conflicts:
drivers/gpio/gpio-vf610.c:
Follow commit 338aa10750ba gpio: vf610: Do not share irq_chip
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c:
Follow commit 67793bd3b394 drm/bridge: adv7511: Fix low refresh rate selection
Use drm_mode_vrefresh(mode) helper
drivers/net/ethernet/freescale/fec_main.c:
Keep downstream file.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Follow commit 46953f97224d brcmfmac: fix missing checks for kmemdup
sound/soc/fsl/Kconfig:
Follow commit ea751227c813 ASoC: imx: fix fiq dependencies
Logical Conflicts:
sound/soc/fsl/fsl_sai.c:
Revert upstream d7325abe29b as downstream fixed it differently
drivers/clk/imx/clk-imx6sl.c
Revert upstream bda9f846ae0 as downstream implemented it differently 68c736e9378
Diffstat (limited to 'drivers/usb/core/hub.c')
| -rw-r--r-- | drivers/usb/core/hub.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index d435adf771bb..d5cbf1b0b777 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5728,7 +5728,10 @@ int usb_reset_device(struct usb_device *udev) cintf->needs_binding = 1; } } - usb_unbind_and_rebind_marked_interfaces(udev); + + /* If the reset failed, hub_wq will unbind drivers later */ + if (ret == 0) + usb_unbind_and_rebind_marked_interfaces(udev); } usb_autosuspend_device(udev); |