d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC: r208117

Browse Source 
Fix a mismerge in r206001 (MFC'ed to stable/8 in r206211).

PR:		146614
Approved by:	jfv (implicit)
This commit is contained in:
Marius Strobl 2010-05-18 17:09:20 +00:00
parent 78c1f0d3c8
commit ed6b099ba7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/e1000/if_em.c
View File

@ -705,6 +705,9 @@ em_detach(device_t dev)
ether_poll_deregister(ifp); ether_poll_deregister(ifp);
#endif #endif
if (adapter->led_dev != NULL)
led_destroy(adapter->led_dev);
EM_CORE_LOCK(adapter); EM_CORE_LOCK(adapter);
adapter->in_detach = 1; adapter->in_detach = 1;
em_stop(adapter); em_stop(adapter);
@ -774,9 +777,6 @@ em_resume(device_t dev)
struct adapter *adapter = device_get_softc(dev); struct adapter *adapter = device_get_softc(dev);
struct ifnet *ifp = adapter->ifp; struct ifnet *ifp = adapter->ifp;
if (adapter->led_dev != NULL)
led_destroy(adapter->led_dev);
EM_CORE_LOCK(adapter); EM_CORE_LOCK(adapter);
em_init_locked(adapter); em_init_locked(adapter);
em_init_manageability(adapter); em_init_manageability(adapter);