[src/netbsd-1-4]: src/sys/arch/mac68k/dev Pull up revision 1.33 (requested by...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8fac374a4bfa
branches:  netbsd-1-4
changeset: 470689:8fac374a4bfa
user:      he <he%NetBSD.org@localhost>
date:      Tue Jun 27 15:38:11 2000 +0000

description:
Pull up revision 1.33 (requested by wrstuden):
  Correct a bug in handling of CLOCAL and MDMBUF flags.

diffstat:

 sys/arch/mac68k/dev/zs.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 42ab9adc7d07 -r 8fac374a4bfa sys/arch/mac68k/dev/zs.c
--- a/sys/arch/mac68k/dev/zs.c  Tue Jun 27 15:35:21 2000 +0000
+++ b/sys/arch/mac68k/dev/zs.c  Tue Jun 27 15:38:11 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs.c,v 1.31.2.1 1999/11/20 17:30:54 he Exp $   */
+/*     $NetBSD: zs.c,v 1.31.2.2 2000/06/27 15:38:11 he Exp $   */
 
 /*
  * Copyright (c) 1996-1998 Bill Studenmund
@@ -738,7 +738,7 @@
                 * Enable only if nothing else will want the interrupt and
                 * it's ok to enable interrupts on this line.
                 */
-               if ((cflag & (CLOCAL & MDMBUF)) == CLOCAL)
+               if ((cflag & (CLOCAL | MDMBUF)) == CLOCAL)
                        cs->cs_rr0_pps = ZSRR0_DCD;
        }
        if ((xcs->cs_hwflags & ZS_HWFLAG_NO_CTS) && (cflag & (CRTSCTS | CDTRCTS)))