diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2014-01-18 04:11:08 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2014-01-18 04:11:08 +0000 |
| commit | f8b50aab6ab97d4a3d5161262f43233d4537f41a (patch) | |
| tree | dcfab38a189a18aa06e5ec0f21c9ff0328b40f48 | |
| parent | 7caa1de290714f082744cecd89e96dbfe8cd2d31 (diff) | |
if the controller is too busy to do a POLLed command, return XS_BUSY
instead of XS_NO_CCB.
ok krw@
| -rw-r--r-- | sys/arch/mvme68k/dev/vs.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/dev/vs.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c index c1d8c9d5b0e..0febab0171a 100644 --- 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 b2956d711fd..afbfe6594e0 100644 --- 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; } |