diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2012-09-22 19:55:14 +0200 |
|---|---|---|
| committer | Pali Rohár <pali.rohar@gmail.com> | 2012-09-22 19:55:14 +0200 |
| commit | 2127e080529704642dd856dcd9a055bca21364ea (patch) | |
| tree | b1df2f5bc3ff8966235bc62a219cbb5235f1b78d /src/image.c | |
| parent | a072a2cf83c46684c015ebc7de7d8e7402762147 (diff) | |
| download | 0xFFFF-2127e080529704642dd856dcd9a055bca21364ea.tar.bz2 | |
image: Fix autoidentify images
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
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"); } |