From 2c50610456cbf194e23f07c483bdf40534d187c7 Mon Sep 17 00:00:00 2001 From: jmcneill Date: Sun, 17 Sep 2006 23:58:51 +0000 Subject: [PATCH] Call rt2560_stop() from rt2560_detach(). Fixes a panic on detach of cardbus device on my Vaio. Fix from dyoung@. --- sys/dev/ic/rt2560.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c index 034a36223a3e..bb18cec3ebe2 100644 --- a/sys/dev/ic/rt2560.c +++ b/sys/dev/ic/rt2560.c @@ -1,4 +1,4 @@ -/* $NetBSD: rt2560.c,v 1.3 2006/06/18 15:44:49 rpaulo Exp $ */ +/* $NetBSD: rt2560.c,v 1.4 2006/09/17 23:58:51 jmcneill Exp $ */ /* $OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $ */ /* $FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/ @@ -24,7 +24,7 @@ * http://www.ralinktech.com/ */ #include -__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.3 2006/06/18 15:44:49 rpaulo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.4 2006/09/17 23:58:51 jmcneill Exp $"); #include "bpfilter.h" @@ -508,6 +508,8 @@ rt2560_detach(void *xsc) callout_stop(&sc->scan_ch); callout_stop(&sc->rssadapt_ch); + rt2560_stop(sc); + ieee80211_ifdetach(&sc->sc_ic); /* free all nodes */ if_detach(ifp);