aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-09-20 08:34:06 -0700
committerMark Brown <broonie@kernel.org>2018-09-20 08:34:06 -0700
commit827ca3b0b92946f4dbf2b6178035163016a12cec (patch)
treeb5e4326155e4713c88d9abad9916f615e9544431 /drivers/usb
parent188f57cf40f066386dcfb4365d7ad69daa05e4bd (diff)
parent70915e25e1cff60c32e79e5b02e9559c1ed7bab2 (diff)
Merge tag 'v4.9.128' into linux-linaro-lsk-v4.9
This is the 4.9.128 stable release
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/xhci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index c190fabd1875..e9f5f9c32b49 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3656,6 +3656,9 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
}
spin_lock_irqsave(&xhci->lock, flags);
+
+ virt_dev->udev = NULL;
+
/* Don't disable the slot if the host controller is dead. */
state = readl(&xhci->op_regs->status);
if (state == 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) ||