if the controller is too busy to do a POLLed command, return XS_BUSY

instead of XS_NO_CCB.

ok krw@

diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index c1d8c9d..0febab0 100644 (file)
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: vs.c,v 1.35 2010/12/23 20:25:15 miod Exp $ */
+/*     $OpenBSD: vs.c,v 1.36 2014/01/18 04:11:07 dlg Exp $ */
 
 /*
  * Copyright (c) 2004, 2009, Miodrag Vallat.
@@ -437,7 +437,7 @@ vs_scsicmd(struct scsi_xfer *xs)
                if (cb->cb_xs != NULL) {
                        printf("%s: master command not idle\n",
                            sc->sc_dev.dv_xname);
-                       xs->error = XS_NO_CCB;
+                       xs->error = XS_BUSY;
                        scsi_done(xs);
                        return;
                }

diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index b2956d7..afbfe65 100644 (file)
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: vs.c,v 1.83 2010/12/23 20:25:18 miod Exp $    */
+/*     $OpenBSD: vs.c,v 1.84 2014/01/18 04:11:07 dlg Exp $     */
 
 /*
  * Copyright (c) 2004, 2009, Miodrag Vallat.
@@ -422,7 +422,7 @@ vs_scsicmd(struct scsi_xfer *xs)
                if (cb->cb_xs != NULL) {
                        printf("%s: master command not idle\n",
                            sc->sc_dev.dv_xname);
-                       xs->error = XS_NO_CCB;
+                       xs->error = XS_BUSY;
                        scsi_done(xs);
                        return;
                }