path: root/ichspi.c
diff options
authorStefan Tauner <>2011-07-01 00:39:01 +0000
committerStefan Tauner <>2011-07-01 00:39:01 +0000
commitccd92a19d41322d160298427600f1d1302a934a5 (patch)
tree064d2bc75762148c5fb60705733282e64bf50f0e /ichspi.c
parent5368dca4363d35d4a67537fc03e1f5d417b87ce5 (diff)
ichspi.c: make REGWRITE* macros safer
'+' does have a quite high precedence so "calling" those macros with a term including weaker operators in the off parameter may have unexpected consequences. Corresponding to flashrom svn r1359. Signed-off-by: Stefan Tauner <> Acked-by: Carl-Daniel Hailfinger <>
Diffstat (limited to 'ichspi.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/ichspi.c b/ichspi.c
index b4eb236..a78034a 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -216,9 +216,9 @@ static uint16_t REGREAD8(int X)
return mmio_readb(ich_spibar + X);
-#define REGWRITE32(off,val) mmio_writel(val, ich_spibar+off)
-#define REGWRITE16(off,val) mmio_writew(val, ich_spibar+off)
-#define REGWRITE8(off,val) mmio_writeb(val, ich_spibar+off)
+#define REGWRITE32(off, val) mmio_writel(val, ich_spibar+(off))
+#define REGWRITE16(off, val) mmio_writew(val, ich_spibar+(off))
+#define REGWRITE8(off, val) mmio_writeb(val, ich_spibar+(off))
/* Common SPI functions */
static int find_opcode(OPCODES *op, uint8_t opcode);
OpenPOWER on IntegriCloud