| commit | 860d57c5deca1131e2db19d4bd56710706105c93 | [log] [tgz] |
|---|---|---|
| author | qctecmdr Service <qctecmdr@qualcomm.com> | Tue Nov 13 18:57:39 2018 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Nov 13 18:57:39 2018 -0800 |
| tree | 00e7eb9aaec73ab8da5186bb94d8de061a16323b | |
| parent | 824b953e82794ef76cc104cd18ab999216dfc908 [diff] | |
| parent | ca23713deb406b05b58ab53f46940f61e124c4c2 [diff] |
Merge "xhci: Fix NULL pointer dereference with xhci_irq() for shared_hcd"
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index c0df8cf..b263ee9 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c
@@ -727,8 +727,6 @@ /* Only halt host and free memory after both hcds are removed */ if (!usb_hcd_is_primary_hcd(hcd)) { - /* usb core will free this hcd shortly, unset pointer */ - xhci->shared_hcd = NULL; mutex_unlock(&xhci->mutex); return; }