diff options
| author | ian <ian@FreeBSD.org> | 2014-05-15 16:11:06 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-05-15 16:11:06 +0000 |
| commit | 20a269e6c7378fda94043f8419c9becbde7f427a (patch) | |
| tree | 675ee07ce869e3193726664b9896e280b0c03239 /sys/dev/usb/controller | |
| parent | ffa1dc9425d9681f0da92d9266010bcc0f81d399 (diff) | |
| download | FreeBSD-src-20a269e6c7378fda94043f8419c9becbde7f427a.zip FreeBSD-src-20a269e6c7378fda94043f8419c9becbde7f427a.tar.gz | |
MFC r261410
Follow r261352 by updating all drivers which are children of simplebus
to check the status property in their probe routines.
Diffstat (limited to 'sys/dev/usb/controller')
| -rw-r--r-- | sys/dev/usb/controller/dwc_otg_fdt.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_fsl.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_imx.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_mv.c | 3 |
4 files changed, 13 insertions, 0 deletions
diff --git a/sys/dev/usb/controller/dwc_otg_fdt.c b/sys/dev/usb/controller/dwc_otg_fdt.c index ac7a18d..0f93286 100644 --- a/sys/dev/usb/controller/dwc_otg_fdt.c +++ b/sys/dev/usb/controller/dwc_otg_fdt.c @@ -75,6 +75,10 @@ struct dwc_otg_super_softc { static int dwc_otg_probe(device_t dev) { + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "synopsys,designware-hs-otg2")) return (ENXIO); diff --git a/sys/dev/usb/controller/ehci_fsl.c b/sys/dev/usb/controller/ehci_fsl.c index 6b485b5..7e728d2 100644 --- a/sys/dev/usb/controller/ehci_fsl.c +++ b/sys/dev/usb/controller/ehci_fsl.c @@ -212,6 +212,9 @@ static int fsl_ehci_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (((ofw_bus_is_compatible(dev, "fsl-usb2-dr")) == 0) && ((ofw_bus_is_compatible(dev, "fsl-usb2-mph")) == 0)) return (ENXIO); diff --git a/sys/dev/usb/controller/ehci_imx.c b/sys/dev/usb/controller/ehci_imx.c index 6d91b7b..d40f18d 100644 --- a/sys/dev/usb/controller/ehci_imx.c +++ b/sys/dev/usb/controller/ehci_imx.c @@ -161,6 +161,9 @@ static int imx_ehci_probe(device_t dev) { + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) { device_set_desc(dev, "Freescale i.MX integrated USB controller"); return (BUS_PROBE_DEFAULT); diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c index a47e253..32a24b5 100644 --- a/sys/dev/usb/controller/ehci_mv.c +++ b/sys/dev/usb/controller/ehci_mv.c @@ -103,6 +103,9 @@ static int mv_ehci_probe(device_t self) { + if (!ofw_bus_status_okay(self)) + return (ENXIO); + if (!ofw_bus_is_compatible(self, "mrvl,usb-ehci")) return (ENXIO); |
