Date: Tue, 18 May 2010 17:09:22 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r208269 - stable/7/sys/dev/e1000 Message-ID: <201005181709.o4IH9MOk013427@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Tue May 18 17:09:22 2010 New Revision: 208269 URL: http://svn.freebsd.org/changeset/base/208269 Log: MFC: r208117 Fix a mismerge in r206001 (MFC'ed to stable/7 in r208105). PR: 146614 Approved by: jfv (implicit) Modified: stable/7/sys/dev/e1000/if_em.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/e1000/if_em.c ============================================================================== --- stable/7/sys/dev/e1000/if_em.c Tue May 18 17:09:20 2010 (r208268) +++ stable/7/sys/dev/e1000/if_em.c Tue May 18 17:09:22 2010 (r208269) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005181709.o4IH9MOk013427>