Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/i2c Assume bitops are meant here.
details: https://anonhg.NetBSD.org/src/rev/bf53a640abd3
branches: trunk
changeset: 331184:bf53a640abd3
user: joerg <joerg%NetBSD.org@localhost>
date: Mon Aug 04 23:28:19 2014 +0000
description:
Assume bitops are meant here.
diffstat:
sys/dev/i2c/x1226.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (40 lines):
diff -r 7ab1391bc2a1 -r bf53a640abd3 sys/dev/i2c/x1226.c
--- a/sys/dev/i2c/x1226.c Mon Aug 04 22:13:23 2014 +0000
+++ b/sys/dev/i2c/x1226.c Mon Aug 04 23:28:19 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x1226.c,v 1.17 2014/07/25 08:10:37 dholland Exp $ */
+/* $NetBSD: x1226.c,v 1.18 2014/08/04 23:28:19 joerg Exp $ */
/*
* Copyright (c) 2003 Shigeyuki Fukushima.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x1226.c,v 1.17 2014/07/25 08:10:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x1226.c,v 1.18 2014/08/04 23:28:19 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -182,8 +182,8 @@
while (uio->uio_resid && uio->uio_offset < X1226_NVRAM_SIZE) {
addr = (int)uio->uio_offset + X1226_NVRAM_START;
- cmdbuf[0] = (addr >> 8) && 0xff;
- cmdbuf[1] = addr && 0xff;
+ cmdbuf[0] = (addr >> 8) & 0xff;
+ cmdbuf[1] = addr & 0xff;
if ((error = iic_exec(sc->sc_tag,
I2C_OP_READ_WITH_STOP,
sc->sc_address, cmdbuf, 2, &ch, 1, 0)) != 0) {
@@ -223,8 +223,8 @@
while (uio->uio_resid && uio->uio_offset < X1226_NVRAM_SIZE) {
addr = (int)uio->uio_offset + X1226_NVRAM_START;
- cmdbuf[0] = (addr >> 8) && 0xff;
- cmdbuf[1] = addr && 0xff;
+ cmdbuf[0] = (addr >> 8) & 0xff;
+ cmdbuf[1] = addr & 0xff;
if ((error = uiomove(&cmdbuf[2], 1, uio)) != 0) {
break;
}
Home |
Main Index |
Thread Index |
Old Index