diff options
| author | marius <marius@FreeBSD.org> | 2010-05-15 19:46:16 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2010-05-15 19:46:16 +0000 |
| commit | 77cd36ce915b25215ba6501aec0f51e98acda373 (patch) | |
| tree | 48c7074e23379bc409f2bdf9ee22c164d88ee7a5 | |
| parent | 612952a975486cc129d4d3ce7b58edee4b73b1e1 (diff) | |
| download | FreeBSD-src-77cd36ce915b25215ba6501aec0f51e98acda373.zip FreeBSD-src-77cd36ce915b25215ba6501aec0f51e98acda373.tar.gz | |
Fix a mismerge in r206001.
PR: 146614
Approved by: jfv (implicit)
MFC afer: 3 days
| -rw-r--r-- | sys/dev/e1000/if_em.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index e245a95..5c1f300 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -710,6 +710,9 @@ em_detach(device_t dev) ether_poll_deregister(ifp); #endif + if (adapter->led_dev != NULL) + led_destroy(adapter->led_dev); + EM_CORE_LOCK(adapter); adapter->in_detach = 1; em_stop(adapter); @@ -779,9 +782,6 @@ em_resume(device_t dev) struct adapter *adapter = device_get_softc(dev); struct ifnet *ifp = adapter->ifp; - if (adapter->led_dev != NULL) - led_destroy(adapter->led_dev); - EM_CORE_LOCK(adapter); em_init_locked(adapter); em_init_manageability(adapter); |
