lkml.org 
[lkml]   [2015]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 039/104] usb: xhci: Allow usb_add/remove_hcd() to be called repeatedly
    Date
    3.16.7-ckt19 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Roger Quadros <rogerq@ti.com>

    commit 8a853759c262fd52ff0f5e89f89c65928077fe4a upstream.

    Don't set xhci->shared_hcd to NULL in xhci_stop() as we have
    still not de-allocated it. It was resulting in a NULL pointer
    de-reference if usb_add/remove_hcd() is called repeatedly.

    We want repeated add/remove to work for the OTG use case.

    Signed-off-by: Roger Quadros <rogerq@ti.com>
    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/usb/host/xhci.c | 6 ------
    1 file changed, 6 deletions(-)

    diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
    index 4170d913ee6e..d7f3adf56af2 100644
    --- a/drivers/usb/host/xhci.c
    +++ b/drivers/usb/host/xhci.c
    @@ -663,12 +663,6 @@ static void xhci_only_stop_hcd(struct usb_hcd *hcd)

    spin_lock_irq(&xhci->lock);
    xhci_halt(xhci);
    -
    - /* The shared_hcd is going to be deallocated shortly (the USB core only
    - * calls this function when allocation fails in usb_add_hcd(), or
    - * usb_remove_hcd() is called). So we need to unset xHCI's pointer.
    - */
    - xhci->shared_hcd = NULL;
    spin_unlock_irq(&xhci->lock);
    }


    \
     
     \ /
      Last update: 2015-10-26 15:41    [W:2.744 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site