Module Name: src
Committed By: ad
Date: Sun Apr 19 12:32:52 UTC 2009
Modified Files:
src/sys/dev/usb: uhci.c
Log Message:
In this case "XXX free other data structures XXX" includes stopping and
destroying the callout.
To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 src/sys/dev/usb/uhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.225 src/sys/dev/usb/uhci.c:1.226
--- src/sys/dev/usb/uhci.c:1.225 Fri Mar 6 23:40:50 2009
+++ src/sys/dev/usb/uhci.c Sun Apr 19 12:32:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.225 2009/03/06 23:40:50 bouyer Exp $ */
+/* $NetBSD: uhci.c,v 1.226 2009/04/19 12:32:52 ad Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.225 2009/03/06 23:40:50 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.226 2009/04/19 12:32:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -620,6 +620,9 @@
free(xfer, M_USB);
}
+ callout_halt(&sc->sc_poll_handle, NULL);
+ callout_destroy(&sc->sc_poll_handle);
+
/* XXX free other data structures XXX */
return (rv);
