Module Name: src
Committed By: jakllsch
Date: Mon Aug 8 14:36:56 UTC 2016
Modified Files:
src/sys/arch/arm/nvidia: tegra_i2c.c
Log Message:
Adjust data pointer using current, rather than upcoming, transfer length.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_i2c.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/arm/nvidia/tegra_i2c.c
diff -u src/sys/arch/arm/nvidia/tegra_i2c.c:1.13 src/sys/arch/arm/nvidia/tegra_i2c.c:1.14
--- src/sys/arch/arm/nvidia/tegra_i2c.c:1.13 Sun Feb 14 19:54:20 2016
+++ src/sys/arch/arm/nvidia/tegra_i2c.c Mon Aug 8 14:36:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.13 2016/02/14 19:54:20 chs Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.14 2016/08/08 14:36:56 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.13 2016/02/14 19:54:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.14 2016/08/08 14:36:56 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -432,8 +432,8 @@ tegra_i2c_write(struct tegra_i2c_softc *
data |= (uint32_t)p[n] << (n * 8);
}
I2C_WRITE(sc, I2C_TX_PACKET_FIFO_REG, data);
- resid -= min(resid, 4);
p += min(resid, 4);
+ resid -= min(resid, 4);
}
return tegra_i2c_wait(sc, flags);
@@ -488,8 +488,8 @@ tegra_i2c_read(struct tegra_i2c_softc *s
for (n = 0; n < min(resid, 4); n++) {
p[n] = (data >> (n * 8)) & 0xff;
}
- resid -= min(resid, 4);
p += min(resid, 4);
+ resid -= min(resid, 4);
}
return tegra_i2c_wait(sc, flags);
