Date: Sat, 15 May 2010 19:46:16 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r208117 - head/sys/dev/e1000 Message-ID: <201005151946.o4FJkGft073012@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Sat May 15 19:46:16 2010 New Revision: 208117 URL: http://svn.freebsd.org/changeset/base/208117 Log: Fix a mismerge in r206001. PR: 146614 Approved by: jfv (implicit) MFC afer: 3 days Modified: head/sys/dev/e1000/if_em.c Modified: head/sys/dev/e1000/if_em.c ============================================================================== --- head/sys/dev/e1000/if_em.c Sat May 15 17:49:56 2010 (r208116) +++ head/sys/dev/e1000/if_em.c Sat May 15 19:46:16 2010 (r208117) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005151946.o4FJkGft073012>