Module Name: src
Committed By: dyoung
Date: Tue Apr 7 18:10:45 UTC 2009
Modified Files:
src/sys/dev/scsipi: scsipi_base.c
Log Message:
Destroy a scsipi_xfer's callout before putting it back into the pool.
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/dev/scsipi/scsipi_base.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/scsipi/scsipi_base.c
diff -u src/sys/dev/scsipi/scsipi_base.c:1.148 src/sys/dev/scsipi/scsipi_base.c:1.149
--- src/sys/dev/scsipi/scsipi_base.c:1.148 Sun May 11 05:17:23 2008
+++ src/sys/dev/scsipi/scsipi_base.c Tue Apr 7 18:10:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_base.c,v 1.148 2008/05/11 05:17:23 mlelstv Exp $ */
+/* $NetBSD: scsipi_base.c,v 1.149 2009/04/07 18:10:45 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.148 2008/05/11 05:17:23 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.149 2009/04/07 18:10:45 dyoung Exp $");
#include "opt_scsi.h"
@@ -499,6 +499,7 @@
SC_DEBUG(periph, SCSIPI_DB3, ("scsipi_free_xs\n"));
TAILQ_REMOVE(&periph->periph_xferq, xs, device_q);
+ callout_destroy(&xs->xs_callout);
pool_put(&scsipi_xfer_pool, xs);
#ifdef DIAGNOSTIC
