[U-Boot] [PATCH] image: fix support for Android boot images with no ramdisk

[U-Boot] [PATCH] image: fix support for Android boot images with no ramdisk

[Rob Herring]

If an Android boot image does not contain a ramdisk, make sure rd_len
and rd_data are returned to indicate no ramdisk rather than just relying
on returning an error.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 common/image-android.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/image-android.c b/common/image-android.c
index d946c2f..b6a94b3 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -130,8 +130,10 @@ ulong android_image_get_kload(const struct andr_img_hdr *hdr)
 int android_image_get_ramdisk(const struct andr_img_hdr *hdr,
 			      ulong *rd_data, ulong *rd_len)
 {
-	if (!hdr->ramdisk_size)
+	if (!hdr->ramdisk_size) {
+		*rd_data = *rd_len = 0;
 		return -1;
+	}
 
 	printf("RAM disk load addr 0x%08x size %u KiB\n",
 	       hdr->ramdisk_addr, DIV_ROUND_UP(hdr->ramdisk_size, 1024));
-- 
2.1.4

[U-Boot] image: fix support for Android boot images with no ramdisk

[Tom Rini]

On Mon, Oct 05, 2015 at 02:37:07PM -0500, Rob Herring wrote:

> If an Android boot image does not contain a ramdisk, make sure rd_len
> and rd_data are returned to indicate no ramdisk rather than just relying
> on returning an error.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151012/8791be72/attachment.sig>