coding style: add parenthesis around the argument of sizeof

[openocd.git] / src / flash / nand / lpc3180.c

diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c
index 1b5306701b66e256cbde8ab4a8f40b71de56739b..389c18ac4d7cd96797dedd570796659adae1718b 100644 (file)
--- a/src/flash/nand/lpc3180.c
+++ b/src/flash/nand/lpc3180.c
@@ -16,9 +16,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -239,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) */
-               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);
@@ -524,8 +522,9 @@ static int lpc3180_write_page(struct nand_device *nand,
                        target_write_u32(target, 0x200b8010, 0x0);
 
                        if (!lpc3180_controller_ready(nand, 1000)) {
-                               LOG_ERROR(
-                                       "timeout while waiting for completion of auto encode cycle");
+                               LOG_ERROR("timeout while waiting for completion of auto encode cycle");
+                               free(page_buffer);
+                               free(oob_buffer);
                                return ERROR_NAND_OPERATION_FAILED;
                        }
                }
@@ -536,11 +535,15 @@ static int lpc3180_write_page(struct nand_device *nand,
                retval = nand_read_status(nand, &status);
                if (retval != ERROR_OK) {
                        LOG_ERROR("couldn't read status");
+                       free(page_buffer);
+                       free(oob_buffer);
                        return ERROR_NAND_OPERATION_FAILED;
                }
 
                if (status & NAND_STATUS_FAIL) {
                        LOG_ERROR("write operation didn't pass, status: 0x%2.2x", status);
+                       free(page_buffer);
+                       free(oob_buffer);
                        return ERROR_NAND_OPERATION_FAILED;
                }
 
@@ -888,8 +891,9 @@ static int lpc3180_read_page(struct nand_device *nand,
                        target_write_u32(target, 0x200b8014, 0xaa55aa55);
 
                        if (!lpc3180_controller_ready(nand, 1000)) {
-                               LOG_ERROR(
-                                       "timeout while waiting for completion of auto decode cycle");
+                               LOG_ERROR("timeout while waiting for completion of auto decode cycle");
+                               free(page_buffer);
+                               free(oob_buffer);
                                return ERROR_NAND_OPERATION_FAILED;
                        }
 
@@ -899,6 +903,8 @@ static int lpc3180_read_page(struct nand_device *nand,
                                if (mlc_isr & 0x40) {
                                        LOG_ERROR("uncorrectable error detected: 0x%2.2x",
                                                (unsigned)mlc_isr);
+                                       free(page_buffer);
+                                       free(oob_buffer);
                                        return ERROR_NAND_OPERATION_FAILED;
                                }
 
@@ -1284,7 +1290,7 @@ COMMAND_HANDLER(handle_lpc3180_select_command)
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], num);
        struct nand_device *nand = get_nand_device_by_num(num);
        if (!nand) {
-               command_print(CMD_CTX, "nand device '#%s' is out of bounds", CMD_ARGV[0]);
+               command_print(CMD, "nand device '#%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
@@ -1304,10 +1310,10 @@ COMMAND_HANDLER(handle_lpc3180_select_command)
        }
 
        if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER)
-               command_print(CMD_CTX, "%s controller selected",
+               command_print(CMD, "%s controller selected",
                        selected[lpc3180_info->selected_controller]);
        else
-               command_print(CMD_CTX,
+               command_print(CMD,
                        lpc3180_info->is_bulk ? "%s controller selected bulk mode is available" :
                        "%s controller selected bulk mode is not available",
                        selected[lpc3180_info->selected_controller]);