X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftarget%2Fimage.c;h=72a3828c36f0cbadef4b75b75d9f373f5962d93a;hb=9334cd451b299afe46703c59d13297ca48b684a4;hp=1eb956728f58c8b45cbca1162177b8aa627b1e99;hpb=040e25424314b49e35eb158eb88e287c76e50596;p=openocd.git

diff --git a/src/target/image.c b/src/target/image.c
index 1eb956728f..72a3828c36 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -57,15 +57,19 @@ static int autodetect_image_type(image_t *image, char *url)
 	{
 		return retval;
 	}
-	if ((retval = fileio_read(&fileio, 9, buffer, &read_bytes)) != ERROR_OK)
-	{
-		return ERROR_FILEIO_OPERATION_FAILED;
-	}
-	if (read_bytes != 9)
+	retval = fileio_read(&fileio, 9, buffer, &read_bytes);
+	
+	if (retval==ERROR_OK)
 	{
-		return ERROR_FILEIO_OPERATION_FAILED;
+		if (read_bytes != 9)
+		{
+			retval=ERROR_FILEIO_OPERATION_FAILED;
+		}
 	}
 	fileio_close(&fileio);
+	
+	if (retval!=ERROR_OK)
+		return retval;
 
 	/* check header against known signatures */
 	if (strncmp((char*)buffer,ELFMAG,SELFMAG)==0)