From owner-svn-src-head@FreeBSD.ORG  Mon Jun  1 16:27:13 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 76A1210656C2;
	Mon,  1 Jun 2009 16:27:13 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6528B8FC14;
	Mon,  1 Jun 2009 16:27:13 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51GRDF4084322;
	Mon, 1 Jun 2009 16:27:13 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51GRDD4084321;
	Mon, 1 Jun 2009 16:27:13 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200906011627.n51GRDD4084321@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 1 Jun 2009 16:27:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193237 - head/sys/dev/bwi
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2009 16:27:14 -0000

Author: imp
Date: Mon Jun  1 16:27:13 2009
New Revision: 193237
URL: http://svn.freebsd.org/changeset/base/193237

Log:
  Make sure that we drain the LED blinking callout on detach.
  
  Submitted by:	Paul B. Mahol

Modified:
  head/sys/dev/bwi/if_bwi.c

Modified: head/sys/dev/bwi/if_bwi.c
==============================================================================
--- head/sys/dev/bwi/if_bwi.c	Mon Jun  1 16:22:01 2009	(r193236)
+++ head/sys/dev/bwi/if_bwi.c	Mon Jun  1 16:27:13 2009	(r193237)
@@ -579,6 +579,7 @@ bwi_detach(struct bwi_softc *sc)
 	int i;
 
 	bwi_stop(sc, 1);
+	callout_drain(&sc->sc_led_blink_ch);
 	callout_drain(&sc->sc_calib_ch);
 	ieee80211_ifdetach(ic);