aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/cy
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1998-11-28 13:18:16 +0000
committerBruce Evans <bde@FreeBSD.org>1998-11-28 13:18:16 +0000
commit4635f7acc062ee3db62b0ab692338d5b27e506a2 (patch)
tree0e14e61a4ff4a1753deeaabfc121284245ea4103 /sys/dev/cy
parent23284b1756d84a82b7fdc54e25a6c892a51744ab (diff)
Notes
Diffstat (limited to 'sys/dev/cy')
-rw-r--r--sys/dev/cy/cy.c4
-rw-r--r--sys/dev/cy/cy_isa.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 1d41b5bf34553..6e810c082eebe 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.73 1998/11/22 17:40:32 bde Exp $
+ * $Id: cy.c,v 1.74 1998/11/23 13:58:55 bde Exp $
*/
#include "opt_compat.h"
@@ -931,7 +931,7 @@ comhardclose(com)
| CD1400_CCR_RCVDIS;
cd1400_channel_cmd(com, com->channel_control);
- if (com->dtr_wait != 0) {
+ if (com->dtr_wait != 0 && !(com->state & CS_DTR_OFF)) {
timeout(siodtrwakeup, com, com->dtr_wait);
com->state |= CS_DTR_OFF;
}
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 1d41b5bf34553..6e810c082eebe 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.73 1998/11/22 17:40:32 bde Exp $
+ * $Id: cy.c,v 1.74 1998/11/23 13:58:55 bde Exp $
*/
#include "opt_compat.h"
@@ -931,7 +931,7 @@ comhardclose(com)
| CD1400_CCR_RCVDIS;
cd1400_channel_cmd(com, com->channel_control);
- if (com->dtr_wait != 0) {
+ if (com->dtr_wait != 0 && !(com->state & CS_DTR_OFF)) {
timeout(siodtrwakeup, com, com->dtr_wait);
com->state |= CS_DTR_OFF;
}