Module Name: src
Committed By: martin
Date: Fri Aug 24 13:14:19 UTC 2012
Modified Files:
src/sys/dev/usb: ulpt.c
Log Message:
Destroy the reader callout on close, as discussed back in may on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/usb/ulpt.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/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.91 src/sys/dev/usb/ulpt.c:1.92
--- src/sys/dev/usb/ulpt.c:1.91 Sun Mar 11 01:06:07 2012
+++ src/sys/dev/usb/ulpt.c Fri Aug 24 13:14:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.91 2012/03/11 01:06:07 mrg Exp $ */
+/* $NetBSD: ulpt.c,v 1.92 2012/08/24 13:14:19 martin Exp $ */
/*
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.91 2012/03/11 01:06:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.92 2012/08/24 13:14:19 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -572,7 +572,8 @@ ulptclose(dev_t dev, int flag, int mode,
if (sc->sc_has_callout) {
DPRINTFN(2, ("ulptclose: stopping read callout\n"));
- callout_stop(&sc->sc_read_callout);
+ callout_halt(&sc->sc_read_callout, NULL);
+ callout_destroy(&sc->sc_read_callout);
sc->sc_has_callout = 0;
}
