Skip to content

Commit f3dc41c

Browse files
matnymangregkh
authored andcommitted
usb: Don't die twice if PCI xhci host is not responding in resume
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: ff9d78b ("USB: Set usb_hcd->state and flags for shared roothubs") Signed-off-by: Mathias Nyman <[email protected]> Cc: stable <[email protected]> Acked-by: Alan Stern <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 78af87b commit f3dc41c

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/usb/core/hcd-pci.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,6 @@ static int resume_common(struct device *dev, int event)
515515
event == PM_EVENT_RESTORE);
516516
if (retval) {
517517
dev_err(dev, "PCI post-resume error %d!\n", retval);
518-
if (hcd->shared_hcd)
519-
usb_hc_died(hcd->shared_hcd);
520518
usb_hc_died(hcd);
521519
}
522520
}

0 commit comments

Comments
 (0)