twa(4): Really stop the callouts.
authorSascha Wildner <saw@online.de>
Sun, 8 Jul 2012 23:05:37 +0000 (01:05 +0200)
committerSascha Wildner <saw@online.de>
Sun, 8 Jul 2012 23:05:37 +0000 (01:05 +0200)
sys/dev/raid/twa/tw_osl_freebsd.c

index 703e058..3b60cf1 100644 (file)
@@ -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. */