lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 190/346] xhci: don't dereference a xhci member after removing xhci
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mathias Nyman <mathias.nyman@linux.intel.com>

    commit f1f6d9a8b540df22b87a5bf6bc104edaade81f47 upstream.

    Remove the hcd after checking for the xhci last quirks, not before.

    This caused a hang on a Alpine Ridge xhci based maching which remove
    the whole xhci controller when unplugging the last usb device

    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [bwh: Backported to 3.16: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/host/xhci-pci.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/usb/host/xhci-pci.c
    +++ b/drivers/usb/host/xhci-pci.c
    @@ -293,12 +293,13 @@ static void xhci_pci_remove(struct pci_d
    usb_remove_hcd(xhci->shared_hcd);
    usb_put_hcd(xhci->shared_hcd);
    }
    - usb_hcd_pci_remove(dev);

    /* Workaround for spurious wakeups at shutdown with HSW */
    if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
    pci_set_power_state(dev, PCI_D3hot);

    + usb_hcd_pci_remove(dev);
    +
    kfree(xhci);
    }

    \
     
     \ /
      Last update: 2016-11-14 04:15    [W:3.839 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site