From 2127e080529704642dd856dcd9a055bca21364ea Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Sat, 22 Sep 2012 19:55:14 +0200 Subject: image: Fix autoidentify images --- src/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/image.c b/src/image.c index d9f4f13..cfccb49 100644 --- a/src/image.c +++ b/src/image.c @@ -180,7 +180,7 @@ static int image_append(struct image * image, const char * type, const char * de image_free(image); return -1; } - if ( ! noverify && detected_type != image->type ) { + if ( ! noverify && detected_type != image->type && detected_type != IMAGE_UNKNOWN ) { ERROR("Image type mishmash (detected %s, got %s)", image_type_to_string(detected_type), type); image_free(image); return -1; @@ -588,7 +588,7 @@ void image_print_info(struct image * image) { if ( str2 ) { printf(", HW revisions: %s\n", str2); free(str2); - } else { + } else if ( str ) { printf("\n"); } -- cgit v1.2.3