lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 054/111] usb: Dont die twice if PCI xhci host is not responding in resume
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit f3dc41c5d22b2ca14a0802a65d8cdc33a3882d4e upstream.

    usb_hc_died() should only be called once, and with the primary HCD
    as parameter. It will mark both primary and secondary hcd's dead.

    Remove the extra call to usb_cd_died with the shared hcd as parameter.

    Fixes: ff9d78b36f76 ("USB: Set usb_hcd->state and flags for shared roothubs")
    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Cc: stable <stable@vger.kernel.org>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/core/hcd-pci.c | 2 --
    1 file changed, 2 deletions(-)

    --- a/drivers/usb/core/hcd-pci.c
    +++ b/drivers/usb/core/hcd-pci.c
    @@ -528,8 +528,6 @@ static int resume_common(struct device *
    event == PM_EVENT_RESTORE);
    if (retval) {
    dev_err(dev, "PCI post-resume error %d!\n", retval);
    - if (hcd->shared_hcd)
    - usb_hc_died(hcd->shared_hcd);
    usb_hc_died(hcd);
    }
    }

    \
     
     \ /
      Last update: 2018-09-24 14:03    [W:2.753 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site