Skip to content

Commit 8e77d3d

Browse files
matnymangregkh
authored andcommitted
Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS"
This reverts commit 4c2604a. Asynch probe caused regression in a setup with both Renesas and Intel xHC controllers. Devices connected to the Renesas disconnected shortly after boot. With Asynch probe the busnumbers got interleaved. xhci_hcd 0000:00:14.0: new USB bus registered, assigned bus number 1 xhci_hcd 0000:04:00.0: new USB bus registered, assigned bus number 2 xhci_hcd 0000:00:14.0: new USB bus registered, assigned bus number 3 xhci_hcd 0000:04:00.0: new USB bus registered, assigned bus number 4 Reason why this commit causes regression is still unknown, but revert it while debugging the issue. Fixes: 4c2604a ("usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS") Cc: stable <[email protected]> Link: https://lore.kernel.org/linux-usb/[email protected] Signed-off-by: Mathias Nyman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ecaa490 commit 8e77d3d

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/usb/host/xhci-pci.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -771,12 +771,11 @@ static struct pci_driver xhci_pci_driver = {
771771
/* suspend and resume implemented later */
772772

773773
.shutdown = usb_hcd_pci_shutdown,
774-
.driver = {
775774
#ifdef CONFIG_PM
776-
.pm = &usb_hcd_pci_pm_ops,
777-
#endif
778-
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
775+
.driver = {
776+
.pm = &usb_hcd_pci_pm_ops
779777
},
778+
#endif
780779
};
781780

782781
static int __init xhci_pci_init(void)

0 commit comments

Comments
 (0)