diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/imx-bbu-nand-fcb.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/common/imx-bbu-nand-fcb.c b/common/imx-bbu-nand-fcb.c index 8c276a43c0..a29a1bf91a 100644 --- a/common/imx-bbu-nand-fcb.c +++ b/common/imx-bbu-nand-fcb.c @@ -1198,9 +1198,8 @@ static int imx_bbu_nand_update(struct bbu_handler *handler, struct bbu_data *dat int ret, i; struct fcb_block *fcb = NULL; void *fw = NULL, *fw_orig = NULL; - unsigned fw_size, partition_size; enum filetype filetype; - unsigned num_blocks_fw; + unsigned num_blocks_fw, fw_size; int used = 0; int fw_orig_len; int used_refresh = 0, unused_refresh = 0; @@ -1222,7 +1221,12 @@ static int imx_bbu_nand_update(struct bbu_handler *handler, struct bbu_data *dat } mtd = bcb_cdev->mtd; - partition_size = mtd->size; + + num_blocks_fw = imx_bbu_firmware_max_blocks(mtd); + if (num_blocks_fw < 1) { + pr_err("Not enough space for firmware\n"); + return -ENOSPC; + } for (i = 0; i < 4; i++) { read_fcb(mtd, i, &fcb); @@ -1329,8 +1333,6 @@ static int imx_bbu_nand_update(struct bbu_handler *handler, struct bbu_data *dat pr_info("Refreshing existing firmware\n"); } - num_blocks_fw = imx_bbu_firmware_max_blocks(mtd); - if (num_blocks_fw * mtd->erasesize < fw_size) { pr_err("Not enough space for update\n"); return -ENOSPC; |