CVS commit: [netbsd-5] src/sys/dev/ic

[Stephen Borrill]

Module Name:    src
Committed By:   sborrill
Date:           Wed Jan 27 21:33:36 UTC 2010

Modified Files:
        src/sys/dev/ic [netbsd-5]: mfi.c

Log Message:
Pull up the following revisions(s) (requested by bouyer in ticket #1256):
        sys/dev/ic/mfi.c:       revision 1.21

Don't release CCB twice. Found by code inspection.


To generate a diff of this commit:
cvs rdiff -u -r1.19.4.1 -r1.19.4.2 src/sys/dev/ic/mfi.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/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.19.4.1 src/sys/dev/ic/mfi.c:1.19.4.2
--- src/sys/dev/ic/mfi.c:1.19.4.1	Thu Sep 10 07:06:34 2009
+++ src/sys/dev/ic/mfi.c	Wed Jan 27 21:33:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.19.4.1 2009/09/10 07:06:34 snj Exp $ */
+/* $NetBSD: mfi.c,v 1.19.4.2 2010/01/27 21:33:36 sborrill Exp $ */
 /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <ma...@peereboom.us>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.19.4.1 2009/09/10 07:06:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.19.4.2 2010/01/27 21:33:36 sborrill Exp $");
 
 #include "bio.h"
 
@@ -1106,7 +1106,6 @@
 			/* XXX check for sense in ccb->ccb_sense? */
 			printf("%s: mfi_scsipi_request poll failed\n",
 			    DEVNAME(sc));
-			mfi_put_ccb(ccb);
 			bzero(&xs->sense, sizeof(xs->sense));
 			xs->sense.scsi_sense.response_code =
 			    SSD_RCODE_VALID | SSD_RCODE_CURRENT;