diff options
| author | peter <peter@FreeBSD.org> | 1999-05-06 18:44:42 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-05-06 18:44:42 +0000 |
| commit | 459d4a2cc5e6111860f2c6a86117a230d98dd4e9 (patch) | |
| tree | 3ebec15b9f996d9b97c11ef575d325c41cea11f1 /sys/dev/sio/sio.c | |
| parent | daa969b0667e983bbabc44c8ddcda321b70523c5 (diff) | |
| download | FreeBSD-src-459d4a2cc5e6111860f2c6a86117a230d98dd4e9.zip FreeBSD-src-459d4a2cc5e6111860f2c6a86117a230d98dd4e9.tar.gz | |
Fix up a few easy 'assignment used as truth value' and 'suggest parens
around && within ||' type warnings. I'm pretty sure I have not masked
any problems here, I've committed real problem fixes seperately.
Diffstat (limited to 'sys/dev/sio/sio.c')
| -rw-r--r-- | sys/dev/sio/sio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 4c62ca9..333235f 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.227 1999/04/24 10:41:21 dt Exp $ + * $Id: sio.c,v 1.228 1999/04/27 11:15:42 phk Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -1395,9 +1395,9 @@ comhardclose(com) * the next open because it might go up and down while * we're not watching. */ - || !com->active_out - && !(com->prev_modem_status & MSR_DCD) - && !(com->it_in.c_cflag & CLOCAL) + || (!com->active_out + && !(com->prev_modem_status & MSR_DCD) + && !(com->it_in.c_cflag & CLOCAL)) || !(tp->t_state & TS_ISOPEN)) { (void)commctl(com, TIOCM_DTR, DMBIC); if (com->dtr_wait != 0 && !(com->state & CS_DTR_OFF)) { @@ -2074,7 +2074,7 @@ comparam(tp, t) /* check requested parameters */ divisor = ttspeedtab(t->c_ospeed, comspeedtab); - if (divisor < 0 || divisor > 0 && t->c_ispeed != t->c_ospeed) + if (divisor < 0 || (divisor > 0 && t->c_ispeed != t->c_ospeed)) return (EINVAL); /* parameters are OK, convert them to the com struct and the device */ |
