diff options
Diffstat (limited to 'sys/dev/mgb')
| -rw-r--r-- | sys/dev/mgb/if_mgb.c | 7 | ||||
| -rw-r--r-- | sys/dev/mgb/if_mgb.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/mgb/if_mgb.c b/sys/dev/mgb/if_mgb.c index 6fafb303143c..409f34167df0 100644 --- a/sys/dev/mgb/if_mgb.c +++ b/sys/dev/mgb/if_mgb.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2019 The FreeBSD Foundation, Inc. + * Copyright (c) 2019 The FreeBSD Foundation * * This driver was written by Gerald ND Aryeetey <gndaryee@uwaterloo.ca> * under sponsorship from the FreeBSD Foundation. @@ -482,8 +482,7 @@ mgb_detach(if_ctx_t ctx) iflib_irq_free(ctx, &sc->rx_irq); iflib_irq_free(ctx, &sc->admin_irq); - if (sc->miibus != NULL) - device_delete_child(sc->dev, sc->miibus); + bus_generic_detach(sc->dev); if (sc->pba != NULL) error = bus_release_resource(sc->dev, SYS_RES_MEMORY, @@ -1436,7 +1435,7 @@ mgb_hw_teardown(struct mgb_softc *sc) /* Stop MAC */ CSR_CLEAR_REG(sc, MGB_MAC_RX, MGB_MAC_ENBL); - CSR_WRITE_REG(sc, MGB_MAC_TX, MGB_MAC_ENBL); + CSR_CLEAR_REG(sc, MGB_MAC_TX, MGB_MAC_ENBL); if ((err = mgb_wait_for_bits(sc, MGB_MAC_RX, MGB_MAC_DSBL, 0))) return (err); if ((err = mgb_wait_for_bits(sc, MGB_MAC_TX, MGB_MAC_DSBL, 0))) diff --git a/sys/dev/mgb/if_mgb.h b/sys/dev/mgb/if_mgb.h index fa49805d73b7..19f6d4a20cc7 100644 --- a/sys/dev/mgb/if_mgb.h +++ b/sys/dev/mgb/if_mgb.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2019 The FreeBSD Foundation, Inc. + * Copyright (c) 2019 The FreeBSD Foundation * * This driver was written by Gerald ND Aryeetey <gndaryee@uwaterloo.ca> * under sponsorship from the FreeBSD Foundation. |