summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2009-04-07 18:10:45 +0000
committerdyoung <dyoung@NetBSD.org>2009-04-07 18:10:45 +0000
commit2e264f40863a2a8087bb4cda9a20c69b3f1af054 (patch)
tree6dd76a2f02e48c7f3ba9eb7780397fa74a9c6ac0 /sys/dev
parentf26cbc49c7725a18d858f909056e6216f61ae636 (diff)
Destroy a scsipi_xfer's callout before putting it back into the pool.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/scsipi/scsipi_base.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/scsipi/scsipi_base.c b/sys/dev/scsipi/scsipi_base.c
index b4c717e5561..6c03b50a43e 100644
--- a/sys/dev/scsipi/scsipi_base.c
+++ b/sys/dev/scsipi/scsipi_base.c
@@ -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 @@ scsipi_put_xs(struct scsipi_xfer *xs)
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