[Openocd-development] New patch to review for openocd: d42e353 mx2: add error propagation and remove warnings

[Gerrit]

This is an automated email from Gerrit.

?yvind Harboe (oyvindhar...@gmail.com) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/48

-- gerrit
commit d42e3535a11b2ce1dc705e9a5a273c9f75f1829a
Author: Øyvind Harboe <oyvind.har...@zylin.com>
Date:   Sat Oct 22 01:11:58 2011 +0200

    mx2: add error propagation and remove warnings
    
    Change-Id: Idd4fb452790e5d7921a749679dbd865586e5a4a9
    Signed-off-by: Øyvind Harboe <oyvind.har...@zylin.com>

diff --git a/src/flash/nand/mx2.c b/src/flash/nand/mx2.c
index 77ae138..6c3c550 100644
--- a/src/flash/nand/mx2.c
+++ b/src/flash/nand/mx2.c
@@ -501,15 +501,20 @@ static int imx27_read_page(struct nand_device *nand, 
uint32_t page,
                return retval;
        }
        /* Reset address_cycles before imx27_command ?? */
-       retval = ERROR_OK;
-       retval |= imx27_command(nand, NAND_CMD_READ0);
-
-       retval |= imx27_address(nand, 0); //col
-       retval |= imx27_address(nand, 0); //col
-       retval |= imx27_address(nand, page & 0xff); //page address
-       retval |= imx27_address(nand, (page >> 8) & 0xff); //page address
-       retval |= imx27_address(nand, (page >> 16) & 0xff); //page address
-       retval |= imx27_command(nand, NAND_CMD_READSTART);
+       retval = imx27_command(nand, NAND_CMD_READ0);
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_address(nand, 0); //col
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_address(nand, 0); //col
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_address(nand, page & 0xff); //page address
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_address(nand, (page >> 8) & 0xff); //page address
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_address(nand, (page >> 16) & 0xff); //page address
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_command(nand, NAND_CMD_READSTART);
+       if (retval != ERROR_OK) return retval;
 
        target_write_u16(target, MX2_NF_BUFADDR, 0);
        mx2_nf_info->fin = MX2_NF_FIN_DATAOUT;

-- 

_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development