From: deraadt <deraadt@openbsd.org>
Date: Wed, 4 Aug 2010 21:02:24 +0000 (+0000)
Subject: on resume:  calling sc_power after ath_init() is silly.  ath_init()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c9272ee4027a39e64209d9c07b30b861aca67d6a;p=openbsd

on resume:  calling sc_power after ath_init() is silly.  ath_init()
gets down to there through ath_init() -> ath_enable() -> ...
from a discussion with damien
---

diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 41b5455ee9d..c25a9f40c52 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.86 2010/07/02 06:06:30 reyk Exp $  */
+/*      $OpenBSD: ath.c,v 1.87 2010/08/04 21:02:24 deraadt Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -529,8 +529,6 @@ ath_resume(struct ath_softc *sc, int why)
 
 	if (ifp->if_flags & IFF_UP) {
 		ath_init(ifp);
-		if (sc->sc_power != NULL)
-			(*sc->sc_power)(sc, why);
 		if (ifp->if_flags & IFF_RUNNING)
 			ath_start(ifp);
 	}