diff options
| author |   jsg <jsg@openbsd.org> | 2015-05-23 12:08:14 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2015-05-23 12:08:14 +0000 |
| commit | 5be10db80c555a8e99091bbf29be3845ff43fa2e (patch) | |
| tree | 218b1a9aeaf833b0ea5591a6eb66d586d1561ae2 | |
| parent | Call if_input() instead of setting the "rcvif" pointer ourself. (diff) | |
| download | wireguard-openbsd-5be10db80c555a8e99091bbf29be3845ff43fa2e.tar.xz wireguard-openbsd-5be10db80c555a8e99091bbf29be3845ff43fa2e.zip | |
use & not && when testing lcr bits
tested by jmatthew
ok pirofti@ jmatthew@ jasper@
| -rw-r--r-- | sys/arch/octeon/dev/octeon_uartbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/octeon/dev/octeon_uartbus.c b/sys/arch/octeon/dev/octeon_uartbus.c index ef13cef42e5..0f15b0b8641 100644 --- a/sys/arch/octeon/dev/octeon_uartbus.c +++ b/sys/arch/octeon/dev/octeon_uartbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octeon_uartbus.c,v 1.5 2014/09/30 06:51:58 jmatthew Exp $ */ +/* $OpenBSD: octeon_uartbus.c,v 1.6 2015/05/23 12:08:14 jsg Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -331,7 +331,7 @@ uartbus_device_to_pa(bus_addr_t addr) bus_size_t uartbus_get_read_reg(bus_size_t o) { - if (lcr && LCR_DLAB) + if (lcr & LCR_DLAB) switch(o) { case com_dlbl: return (bus_size_t)0x80; @@ -355,7 +355,7 @@ uartbus_get_write_reg(bus_size_t o, u_int8_t v) return (bus_size_t)0x50; } - if (lcr && LCR_DLAB) + if (lcr & LCR_DLAB) switch(o) { case com_dlbl: return (bus_size_t)0x80; |