svn commit: r208268 - stable/8/sys/dev/e1000
Marius Strobl
marius at FreeBSD.org
Tue May 18 17:09:20 UTC 2010
Author: marius
Date: Tue May 18 17:09:20 2010
New Revision: 208268
URL: http://svn.freebsd.org/changeset/base/208268
Log:
MFC: r208117
Fix a mismerge in r206001 (MFC'ed to stable/8 in r206211).
PR: 146614
Approved by: jfv (implicit)
Modified:
stable/8/sys/dev/e1000/if_em.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/geom/sched/ (props changed)
Modified: stable/8/sys/dev/e1000/if_em.c
==============================================================================
--- stable/8/sys/dev/e1000/if_em.c Tue May 18 17:02:35 2010 (r208267)
+++ stable/8/sys/dev/e1000/if_em.c Tue May 18 17:09:20 2010 (r208268)
@@ -705,6 +705,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);
@@ -774,9 +777,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);
More information about the svn-src-all
mailing list