diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-12-01 21:06:07 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-12-01 21:06:07 -0600 |
| commit | f0d3858518cf76dc6fda4b26467e1534c92817c7 (patch) | |
| tree | f62ed55e2f1402ce5c702d75217e24103d611c25 | |
| parent | 95b4a0ba81fa63c99fce8878aea55bf96103c162 (diff) | |
| download | px4-nuttx-f0d3858518cf76dc6fda4b26467e1534c92817c7.tar.gz px4-nuttx-f0d3858518cf76dc6fda4b26467e1534c92817c7.tar.bz2 px4-nuttx-f0d3858518cf76dc6fda4b26467e1534c92817c7.zip | |
MTD NAND: Fix a misplaced endif
| -rw-r--r-- | nuttx/drivers/mtd/hamming.c | 6 | ||||
| -rwxr-xr-x | nuttx/drivers/mtd/mtd_nand.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/drivers/mtd/hamming.c b/nuttx/drivers/mtd/hamming.c index 6f8f617a3..82622ab3e 100644 --- a/nuttx/drivers/mtd/hamming.c +++ b/nuttx/drivers/mtd/hamming.c @@ -300,9 +300,9 @@ static int hamming_verify256(FAR uint8_t *data, FAR const uint8_t *original) /* If all bytes are 0, there is no error */ if ((correction[0] == 0) && (correction[1] == 0) && (correction[2] == 0)) - { + { return 0; - } + } /* If there is a single bit error, there are 11 bits set to 1 */ @@ -333,7 +333,7 @@ static int hamming_verify256(FAR uint8_t *data, FAR const uint8_t *original) data[byte] ^= (1 << bit); return HAMMING_ERROR_SINGLEBIT; - } + } /* Check if ECC has been corrupted */ diff --git a/nuttx/drivers/mtd/mtd_nand.c b/nuttx/drivers/mtd/mtd_nand.c index 7be262563..9122554a8 100755 --- a/nuttx/drivers/mtd/mtd_nand.c +++ b/nuttx/drivers/mtd/mtd_nand.c @@ -523,6 +523,7 @@ static int nand_writepage(FAR struct nand_dev_s *nand, off_t block, fdbg("ERROR: Block is BAD\n"); return -EAGAIN; } +#endif #ifdef CONFIG_MTD_NAND_SWECC /* nandecc_writepage will handle the software ECC case */ @@ -541,7 +542,6 @@ static int nand_writepage(FAR struct nand_dev_s *nand, off_t block, else #endif -#endif { return NAND_WRITEPAGE(nand->raw, block, page, data, NULL); } |