Module Name: src
Committed By: jakllsch
Date: Wed Feb 1 19:10:33 UTC 2017
Modified Files:
src/sys/dev/isa: gus.c
Log Message:
Use boolean logical and operation on booleans, rather than bitwise and.
>From David Binderman in PR kern/51936.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/isa/gus.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/dev/isa/gus.c
diff -u src/sys/dev/isa/gus.c:1.110 src/sys/dev/isa/gus.c:1.111
--- src/sys/dev/isa/gus.c:1.110 Mon Jul 11 11:31:50 2016
+++ src/sys/dev/isa/gus.c Wed Feb 1 19:10:33 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.110 2016/07/11 11:31:50 msaitoh Exp $ */
+/* $NetBSD: gus.c,v 1.111 2017/02/01 19:10:33 jakllsch Exp $ */
/*-
* Copyright (c) 1996, 1999, 2008 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.110 2016/07/11 11:31:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.111 2017/02/01 19:10:33 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1027,7 +1027,7 @@ gusattach(device_t parent, device_t self
printf(", %dKB memory\n", sc->sc_dsize);
/* A GUS MAX should always have a CODEC installed */
- if ((sc->sc_revision >= 10) & !(HAS_CODEC(sc)))
+ if ((sc->sc_revision >= 10) && !(HAS_CODEC(sc)))
printf("%s: WARNING: did not attach CODEC on MAX\n",
device_xname(sc->sc_dev));
