summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatrick <patrick@openbsd.org>2017-09-13 20:26:26 +0000
committerpatrick <patrick@openbsd.org>2017-09-13 20:26:26 +0000
commitc7b07e68b68d71e7b713500d3a12ae6e4d314e6d (patch)
tree146b153a0307353a362b570d28e0236ae4f0635c
parentCheck that pending "message repeated" is printed at exit and restart. (diff)
downloadwireguard-openbsd-c7b07e68b68d71e7b713500d3a12ae6e4d314e6d.tar.xz
wireguard-openbsd-c7b07e68b68d71e7b713500d3a12ae6e4d314e6d.zip
Add missing pipe in sxitwi(4)'s match code to actually make
it a logical OR intead of a binary OR. From Artturi Alm
-rw-r--r--sys/dev/fdt/sxitwi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/fdt/sxitwi.c b/sys/dev/fdt/sxitwi.c
index 260f6f1de57..f53f2bfd594 100644
--- a/sys/dev/fdt/sxitwi.c
+++ b/sys/dev/fdt/sxitwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sxitwi.c,v 1.1 2017/07/23 19:26:03 kettenis Exp $ */
+/* $OpenBSD: sxitwi.c,v 1.2 2017/09/13 20:26:26 patrick Exp $ */
/* $NetBSD: gttwsi_core.c,v 1.2 2014/11/23 13:37:27 jmcneill Exp $ */
/*
* Copyright (c) 2008 Eiji Kawauchi.
@@ -178,7 +178,7 @@ sxitwi_match(struct device *parent, void *match, void *aux)
{
struct fdt_attach_args *faa = aux;
- return (OF_is_compatible(faa->fa_node, "allwinner,sun4i-a10-i2c") |
+ return (OF_is_compatible(faa->fa_node, "allwinner,sun4i-a10-i2c") ||
OF_is_compatible(faa->fa_node, "allwinner,sun7i-a20-i2c"));
}