diff options
author | Damien Miller <djm@cvs.openbsd.org> | 2005-01-28 22:35:17 +0000 |
---|---|---|
committer | Damien Miller <djm@cvs.openbsd.org> | 2005-01-28 22:35:17 +0000 |
commit | 52182725b09932fb0fcdd6e1d2c018a965e3c599 (patch) | |
tree | 2330a5f35681cdcfa0266498bfc70b5de292ac09 | |
parent | c41710eaff7a33da3fe8d6ea570aecd22de41802 (diff) |
fix merge errors from r1.18; tested hshoexer & henning; ok henning@ dlg@
-rw-r--r-- | sys/dev/usb/uplcom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index 2aec05ef999..d926fe9e54a 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uplcom.c,v 1.20 2005/01/16 06:18:12 dlg Exp $ */ +/* $OpenBSD: uplcom.c,v 1.21 2005/01/28 22:35:16 djm Exp $ */ /* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -524,7 +524,7 @@ uplcom_dtr(struct uplcom_softc *sc, int onoff) if (sc->sc_dtr != -1 && !sc->sc_dtr == !onoff) return; - sc->sc_dtr = !onoff; + sc->sc_dtr = !!onoff; uplcom_set_line_state(sc); } @@ -534,10 +534,10 @@ uplcom_rts(struct uplcom_softc *sc, int onoff) { DPRINTF(("uplcom_rts: onoff=%d\n", onoff)); - if (sc->sc_rts == -1 && !sc->sc_dtr == !onoff) + if (sc->sc_rts == -1 && !sc->sc_rts == !onoff) return; - sc->sc_rts = !onoff; + sc->sc_rts = !!onoff; uplcom_set_line_state(sc); } |