summaryrefslogtreecommitdiffstats
path: root/sys/dev/dc
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/dc')
-rw-r--r--sys/dev/dc/dcphy.c1
-rw-r--r--sys/dev/dc/if_dc.c2
-rw-r--r--sys/dev/dc/pnphy.c1
3 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index f4fc512..5c60ad5 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 772eede..b9567de 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -1385,7 +1385,7 @@ dc_netcfg_wait(struct dc_softc *sc)
break;
DELAY(10);
}
- if (i == DC_TIMEOUT) {
+ if (i == DC_TIMEOUT && bus_child_present(sc->dc_dev)) {
if (!(isr & DC_ISR_TX_IDLE) && !DC_IS_ASIX(sc))
device_printf(sc->dc_dev,
"%s: failed to force tx to idle state\n", __func__);
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index 6468fbf..6546acd 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <dev/dc/if_dcreg.h>
OpenPOWER on IntegriCloud