From: Sascha Wildner <saw@online.de>
Date: Sun, 8 Jul 2012 23:05:37 +0000 (+0200)
Subject: twa(4): Really stop the callouts.
X-Git-Tag: v3.2.0~637
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/dabf5ccb2349914f9d58604acc32ccf4cf805758

twa(4): Really stop the callouts.
---

diff --git a/sys/dev/raid/twa/tw_osl_freebsd.c b/sys/dev/raid/twa/tw_osl_freebsd.c
index 703e058c44..3b60cf1cb5 100644
--- a/sys/dev/raid/twa/tw_osl_freebsd.c
+++ b/sys/dev/raid/twa/tw_osl_freebsd.c
@@ -885,10 +885,13 @@ twa_shutdown(device_t dev)
 	/* Disconnect interrupts. */
 	error = twa_teardown_intr(sc);
 
-#if 0 /* XXX swildner */
 	/* Stop watchdog task. */
+#if 0 /* XXX swildner */
 	callout_drain(&(sc->watchdog_callout[0]));
 	callout_drain(&(sc->watchdog_callout[1]));
+#else
+	callout_stop(&(sc->watchdog_callout[0]));
+	callout_stop(&(sc->watchdog_callout[1]));
 #endif
 
 	/* Disconnect from the controller. */