src/flash/nand: Fix some operator precedence bugs.

Fix two expressions where precedence of operator | vs ?: was clearly confused.
Untested - was clearly not expressing the intent of the author by inspection.
Found by automated tooling and rtrieu@google.com.

Change-Id: I46f190154797f8affc761caf3a15a1a9db53d702
Signed-off-by: Seth LaForge <sethml@google.com>
Reviewed-on: http://openocd.zylin.com/5281
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>

diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c
index 436580e3739db6830e5649cb282f01cca429cdc7..389c18ac4d7cd96797dedd570796659adae1718b 100644 (file)
--- a/src/flash/nand/lpc3180.c
+++ b/src/flash/nand/lpc3180.c
@@ -237,7 +237,7 @@ static int lpc3180_init(struct nand_device *nand)
 
                /* SLC_CFG = 0x (Force nCE assert, DMA ECC enabled, ECC enabled, DMA burst enabled,
                 *DMA read from SLC, WIDTH = bus_width) */
 
                /* SLC_CFG = 0x (Force nCE assert, DMA ECC enabled, ECC enabled, DMA burst enabled,
                 *DMA read from SLC, WIDTH = bus_width) */

-               target_write_u32(target, 0x20020014, 0x3e | (bus_width == 16) ? 1 : 0);
+               target_write_u32(target, 0x20020014, 0x3e | ((bus_width == 16) ? 1 : 0));

 
                /* SLC_IEN = 3 (INT_RDY_EN = 1) ,(INT_TC_STAT = 1) */
                target_write_u32(target, 0x20020020, 0x03);
 
                /* SLC_IEN = 3 (INT_RDY_EN = 1) ,(INT_TC_STAT = 1) */
                target_write_u32(target, 0x20020020, 0x03);

diff --git a/src/flash/nand/lpc32xx.c b/src/flash/nand/lpc32xx.c
index 6febe16a1b5e40856c1e8af031a351b3b102a920..058d9a50ee5efc6f9ea91104429a1b64cb9dc42b 100644 (file)
--- a/src/flash/nand/lpc32xx.c
+++ b/src/flash/nand/lpc32xx.c
@@ -332,7 +332,7 @@ static int lpc32xx_init(struct nand_device *nand)
                        WIDTH = bus_width)
                */
                retval = target_write_u32(target, 0x20020014,
                        WIDTH = bus_width)
                */
                retval = target_write_u32(target, 0x20020014,

-                               0x3e | (bus_width == 16) ? 1 : 0);
+                               0x3e | ((bus_width == 16) ? 1 : 0));

                if (ERROR_OK != retval) {
                        LOG_ERROR("could not set SLC_CFG");
                        return ERROR_NAND_OPERATION_FAILED;
                if (ERROR_OK != retval) {
                        LOG_ERROR("could not set SLC_CFG");
                        return ERROR_NAND_OPERATION_FAILED;