summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/ic/isp.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index 0c2f9209cb7..46cd862ef64 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp.c,v 1.50 2010/11/20 05:12:38 deraadt Exp $ */
+/* $OpenBSD: isp.c,v 1.51 2010/12/31 19:26:00 kettenis Exp $ */
/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.150 2008/12/15 21:42:38 marius Exp $*/
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
@@ -4059,6 +4059,18 @@ isp_start(XS_T *xs)
}
/*
+ * The firmware on the 1020/1020A doesn't seem to implement
+ * extended commands. Bail out early since we don't seem to
+ * be able to recover from issuing a command that isn't
+ * implemented.
+ */
+
+ if (XS_CDBLEN(xs) > 12 && isp->isp_type < ISP_HA_SCSI_1040) {
+ XS_SETERR(xs, HBA_BOTCH);
+ return (CMD_COMPLETE);
+ }
+
+ /*
* Translate the target to device handle as appropriate, checking
* for correct device state as well.
*/