summaryrefslogtreecommitdiff
path: root/sys/dev/ic/isp.c
diff options
context:
space:
mode:
authormjacob <mjacob@cvs.openbsd.org>2003-03-03 18:43:52 +0000
committermjacob <mjacob@cvs.openbsd.org>2003-03-03 18:43:52 +0000
commit21d85c4d6ab6901e18fda5471271d61790897c8e (patch)
tree709a8fb6df7918bb75ce9ac40388bd9079ef27ab /sys/dev/ic/isp.c
parent51e6d194898267ac753f19bb84e42a5d5f372b49 (diff)
Argh. Put back mickey's change here and also follow Ted's suggestion
wrt bogus identity assignments.
Diffstat (limited to 'sys/dev/ic/isp.c')
-rw-r--r--sys/dev/ic/isp.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index 5130c8185f3..debaef640db 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp.c,v 1.31 2003/03/03 18:31:42 mjacob Exp $ */
+/* $OpenBSD: isp.c,v 1.32 2003/03/03 18:43:51 mjacob Exp $ */
/*
* Machine and OS Independent (well, as best as possible)
* code for the Qlogic ISP SCSI adapters.
@@ -399,7 +399,7 @@ isp_reset(struct ispsoftc *isp)
isp_prt(isp, ISP_LOGCONFIG, "Ultra Mode Capable");
sdp->isp_ultramode = 1;
/*
- * If we're in Ultra Mode, we have to be 60Mhz clock-
+ * If we're in Ultra Mode, we have to be 60MHz clock-
* even for the SBus version.
*/
isp->isp_clock = 60;
@@ -4296,10 +4296,8 @@ isp_handle_other_response(struct ispsoftc *isp, int type,
if (isp_target_notify(isp, (ispstatusreq_t *) hp, optrp)) {
return (1);
}
-#else
- optrp = optrp;
- /* FALLTHROUGH */
#endif
+ /* FALLTHROUGH */
case RQSTYPE_REQUEST:
default:
if (isp_async(isp, ISPASYNC_UNHANDLED_RESPONSE, hp)) {