diff options
| author | Michael Neuling <mikey@neuling.org> | 2017-03-25 20:18:43 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-03-27 14:21:00 +1100 |
| commit | 6a3a09c27315d858647a1c978fa7032591a8e6c5 (patch) | |
| tree | e65b68f61ef35469014d8be22acb524b99eddc02 /libflash/libffs.c | |
| parent | 461d410dee0dc5e5deac948ebdcc4ec75eefe682 (diff) | |
| download | blackbird-skiboot-6a3a09c27315d858647a1c978fa7032591a8e6c5.tar.gz blackbird-skiboot-6a3a09c27315d858647a1c978fa7032591a8e6c5.zip | |
libflash: Fix pflash -i
pflash -i is currently broken due to this commit
commit 602dee4505cd0ceb5b69f056ec403f982b585791
Author: Cyril Bur <cyril.bur@au1.ibm.com>
libflash/libffs: Rework libffs
It's output doesn't correctly detect the last partition and continues
printing forever.
This fixes it by returning null when we don't find a partition in
ffs_get_part().
Signed-off-by: Michael Neuling <mikey@neuling.org>
Acked-by: Cyril Bur <cyril.bur@au1.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'libflash/libffs.c')
| -rw-r--r-- | libflash/libffs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libflash/libffs.c b/libflash/libffs.c index 9ce72248..dca40188 100644 --- a/libflash/libffs.c +++ b/libflash/libffs.c @@ -187,9 +187,10 @@ static struct ffs_entry *ffs_get_part(struct ffs_handle *ffs, uint32_t index) list_for_each(&ffs->hdr.entries, ent, list) if (i++ == index) - break; + return ent; - return ent; + /* Didn't find partition */ + return NULL; } bool has_ecc(struct ffs_entry *ent) |
