Module Name: src
Committed By: tsutsui
Date: Mon Jul 16 11:31:13 UTC 2012
Modified Files:
src/sys/arch/luna68k/dev: lunaws.c
Log Message:
Use & not && to mask bits. From OpenBSD/luna88k
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/luna68k/dev/lunaws.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/dev/lunaws.c
diff -u src/sys/arch/luna68k/dev/lunaws.c:1.23 src/sys/arch/luna68k/dev/lunaws.c:1.24
--- src/sys/arch/luna68k/dev/lunaws.c:1.23 Wed Jul 27 14:17:54 2011
+++ src/sys/arch/luna68k/dev/lunaws.c Mon Jul 16 11:31:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.23 2011/07/27 14:17:54 tsutsui Exp $ */
+/* $NetBSD: lunaws.c,v 1.24 2012/07/16 11:31:13 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.23 2011/07/27 14:17:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.24 2012/07/16 11:31:13 tsutsui Exp $");
#include "wsmouse.h"
@@ -228,7 +228,7 @@ wsintr(int chan)
#endif
} while ((rr = getsiocsr(sio)) & RR_RXRDY);
}
- if (rr && RR_TXRDY)
+ if (rr & RR_TXRDY)
sio->sio_cmd = WR0_RSTPEND;
/* not capable of transmit, yet */
}
