From 3480526cdef7f3796e33f0c607f9c21e57480a8c Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Sat, 12 Jan 2013 14:26:47 +0100 Subject: main: Fix loading kernel & initfs images --- src/main.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index ca6f1a5..6e5b066 100644 --- a/src/main.c +++ b/src/main.c @@ -1037,29 +1037,29 @@ int main(int argc, char **argv) { /* load */ if ( dev_load ) { - ret = 0; - - if ( image_kernel ) + if ( image_kernel ) { ret = dev_load_image(dev, image_kernel->image); - if ( ret < 0 ) - goto again; + if ( ret < 0 ) + goto again; - if ( image_kernel == image_first ) - image_first = image_first->next; - image_list_unlink(image_kernel); - free(image_kernel); - image_kernel = NULL; + if ( image_kernel == image_first ) + image_first = image_first->next; + image_list_unlink(image_kernel); + free(image_kernel); + image_kernel = NULL; + } - if ( image_initfs ) + if ( image_initfs ) { ret = dev_load_image(dev, image_initfs->image); - if ( ret < 0 ) - goto again; + if ( ret < 0 ) + goto again; - if ( image_initfs == image_first ) - image_first = image_first->next; - image_list_unlink(image_initfs); - free(image_initfs); - image_initfs = NULL; + if ( image_initfs == image_first ) + image_first = image_first->next; + image_list_unlink(image_initfs); + free(image_initfs); + image_initfs = NULL; + } } /* flash */ -- cgit v1.2.3