spl: ymodem: Terminate YModem session on error
authorMarek Vasut <marek.vasut+renesas@gmail.com>
Tue, 12 Mar 2019 03:02:39 +0000 (04:02 +0100)
committerMarek Vasut <marex@denx.de>
Tue, 9 Apr 2019 16:19:09 +0000 (18:19 +0200)
In case spl_parse_image_header() errors out, terminate the YModem
session, otherwise we won't get any further output.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Tom Rini <trini@konsulko.com>
common/spl/spl_ymodem.c

index 577fdc69afe08078cec7a0386dd06d9f53bf50c9..8058fd6a7c79f2dae6735b9cfe0bd88049faaf56 100644 (file)
@@ -111,7 +111,7 @@ static int spl_ymodem_load_image(struct spl_image_info *spl_image,
                ih = (struct image_header *)buf;
                ret = spl_parse_image_header(spl_image, ih);
                if (ret)
-                       return ret;
+                       goto end_stream;
 #ifdef CONFIG_SPL_GZIP
                if (ih->ih_comp == IH_COMP_GZIP)
                        addr = CONFIG_SYS_LOAD_ADDR;
@@ -147,6 +147,7 @@ end_stream:
        xyzModem_stream_terminate(false, &getcymodem);
 
        printf("Loaded %lu bytes\n", size);
-       return 0;
+
+       return ret;
 }
 SPL_LOAD_IMAGE_METHOD("UART", 0, BOOT_DEVICE_UART, spl_ymodem_load_image);