diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-08-19 13:19:02 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-08-19 13:19:02 +1000 |
| commit | cf16f91604ef9bebd6752a3c497058f0bcdc65cd (patch) | |
| tree | 139006717e85a3aa30316dd91ea8d4d2a7ae2449 | |
| parent | 5d186d57c7c46461016343428fe943f8a5f58a1d (diff) | |
| download | skiboot-cf16f91604ef9bebd6752a3c497058f0bcdc65cd.zip skiboot-cf16f91604ef9bebd6752a3c497058f0bcdc65cd.tar.gz skiboot-cf16f91604ef9bebd6752a3c497058f0bcdc65cd.tar.bz2 | |
in skbioot-5.1.0 commit, accidentally somehow removed two compiler warning fixes.
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | external/gard/gard.c | 2 | ||||
| -rw-r--r-- | libflash/libffs.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/external/gard/gard.c b/external/gard/gard.c index c4e8676..d84e098 100644 --- a/external/gard/gard.c +++ b/external/gard/gard.c @@ -620,7 +620,7 @@ int main(int argc, char **argv) const char *fdt_flash_path = FDT_ACTIVE_FLASH_PATH; char *filename = NULL; struct gard_ctx _ctx, *ctx; - int i, rc; + int rc, i = 0; bool part = 0; bool ecc = 0; diff --git a/libflash/libffs.c b/libflash/libffs.c index 0164071..3010a61 100644 --- a/libflash/libffs.c +++ b/libflash/libffs.c @@ -144,7 +144,13 @@ int ffs_init(uint32_t offset, uint32_t max_size, struct blocklevel_device *bl, uint32_t start, total_size; bool ecc; for (i = 0; i < f->hdr.entry_count; i++) { - ffs_part_info(f, i, NULL, &start, &total_size, NULL, &ecc); + rc = ffs_part_info(f, i, NULL, &start, &total_size, + NULL, &ecc); + if (rc) { + FL_ERR("FFS: Failed to read ffs partition %d\n", + i); + goto out; + } if (ecc) { rc = blocklevel_ecc_protect(bl, start, total_size); if (rc) { |