Module Name: src
Committed By: bouyer
Date: Sun Nov 24 18:02:08 UTC 2013
Modified Files:
src/sys/dev/pci: trm.c
Log Message:
XS_NOERROR | XS_RESET doens't make sense, XS_RESET is what is wanted here.
Pointed out by Edgar Fu�
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/trm.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/pci/trm.c
diff -u src/sys/dev/pci/trm.c:1.34 src/sys/dev/pci/trm.c:1.35
--- src/sys/dev/pci/trm.c:1.34 Sun Sep 15 14:53:03 2013
+++ src/sys/dev/pci/trm.c Sun Nov 24 18:02:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: trm.c,v 1.34 2013/09/15 14:53:03 martin Exp $ */
+/* $NetBSD: trm.c,v 1.35 2013/11/24 18:02:08 bouyer Exp $ */
/*-
* Copyright (c) 2002 Izumi Tsutsui. All rights reserved.
*
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.34 2013/09/15 14:53:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.35 2013/11/24 18:02:08 bouyer Exp $");
/* #define TRM_DEBUG */
#ifdef TRM_DEBUG
@@ -703,7 +703,7 @@ trm_scsipi_request(struct scsipi_channel
xs->xs_periph->periph_lun));
if (xs->xs_control & XS_CTL_RESET) {
trm_reset(sc);
- xs->error = XS_NOERROR | XS_RESET;
+ xs->error = XS_RESET;
return;
}
if (xs->xs_status & XS_STS_DONE) {
