From 9b0e3c5a47e8b6746df26a90b05bfe5fda082161 Mon Sep 17 00:00:00 2001 From: Neel Natu Date: Mon, 13 Apr 2015 19:13:51 +0000 Subject: [PATCH] Modify the return value of the uhci/ehci/xhci PCI probe routines to 'BUS_PROBE_DEFAULT'. This allows bhyve's 'ppt' driver to claim ownership of the device and pass it through to the guest. In the common case where there are no competing drivers for USB controllers this change is a no-op. Reviewed by: hselasky MFC after: 2 weeks --- sys/dev/usb/controller/ehci_pci.c | 2 +- sys/dev/usb/controller/uhci_pci.c | 2 +- sys/dev/usb/controller/xhci_pci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index b71fb415dcb0..9b862a5a0181 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -220,7 +220,7 @@ ehci_pci_probe(device_t self) if (desc) { device_set_desc(self, desc); - return (0); + return (BUS_PROBE_DEFAULT); } else { return (ENXIO); } diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index 4ac0d54db42f..89fc983c8180 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -244,7 +244,7 @@ uhci_pci_probe(device_t self) if (desc) { device_set_desc(self, desc); - return (0); + return (BUS_PROBE_DEFAULT); } else { return (ENXIO); } diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index c2367f4c4a45..0e2c63201cb5 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -131,7 +131,7 @@ xhci_pci_probe(device_t self) if (desc) { device_set_desc(self, desc); - return (0); + return (BUS_PROBE_DEFAULT); } else { return (ENXIO); }