[U-Boot] [PATCH] fb_mmc.c: Correct blk_dread() return value checks

The function blk_dread will return -ENOSYS on failure or on success the number of blocks read, which must be the number asked to read (otherwise it failed somewhere). Correct this check.
Cc: Lukasz Majewski lukma@denx.de Signed-off-by: Tom Rini trini@konsulko.com --- common/fb_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/fb_mmc.c b/common/fb_mmc.c index 2113b6c37239..8cef1c44075c 100644 --- a/common/fb_mmc.c +++ b/common/fb_mmc.c @@ -132,7 +132,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc,
/* Read the boot image header */ res = blk_dread(dev_desc, info->start, hdr_sectors, (void *)hdr); - if (res == 0) { + if (res != hdr_sectors) { error("cannot read header from boot partition"); fastboot_fail("cannot read header from boot partition"); return 0; @@ -215,7 +215,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, ramdisk_buffer = (u8 *)hdr + (hdr_sectors * info.blksz); res = blk_dread(dev_desc, ramdisk_sector_start, ramdisk_sectors, ramdisk_buffer); - if (res == 0) { + if (res != ramdisk_sectors) { error("cannot read ramdisk from boot partition"); fastboot_fail("cannot read ramdisk from boot partition"); return -1;

On 08/15/2017 03:00 AM, Tom Rini wrote:
The function blk_dread will return -ENOSYS on failure or on success the number of blocks read, which must be the number asked to read (otherwise it failed somewhere). Correct this check.
Cc: Lukasz Majewski lukma@denx.de Signed-off-by: Tom Rini trini@konsulko.com
common/fb_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/fb_mmc.c b/common/fb_mmc.c index 2113b6c37239..8cef1c44075c 100644 --- a/common/fb_mmc.c +++ b/common/fb_mmc.c @@ -132,7 +132,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc,
/* Read the boot image header */ res = blk_dread(dev_desc, info->start, hdr_sectors, (void *)hdr);
- if (res == 0) {
- if (res != hdr_sectors) { error("cannot read header from boot partition"); fastboot_fail("cannot read header from boot partition"); return 0;
@@ -215,7 +215,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, ramdisk_buffer = (u8 *)hdr + (hdr_sectors * info.blksz); res = blk_dread(dev_desc, ramdisk_sector_start, ramdisk_sectors, ramdisk_buffer);
- if (res == 0) {
- if (res != ramdisk_sectors) { error("cannot read ramdisk from boot partition"); fastboot_fail("cannot read ramdisk from boot partition"); return -1;
Reviewed-by: Łukasz Majewski lukma@denx.de
I've applied this patch to -dfu tree.
participants (2)
-
Tom Rini
-
Łukasz Majewski