From da743b84ef98567c401faafba00740bb2d6af4ce Mon Sep 17 00:00:00 2001
From: Dominic Spill <dominicgs@gmail.com>
Date: Fri, 27 Jan 2017 16:08:57 -0700
Subject: [PATCH] Safely call hackrf_close() after resetting the HackRF

---
 host/hackrf-tools/src/hackrf_spiflash.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/host/hackrf-tools/src/hackrf_spiflash.c b/host/hackrf-tools/src/hackrf_spiflash.c
index 3304b5b3..49cc2bf9 100644
--- a/host/hackrf-tools/src/hackrf_spiflash.c
+++ b/host/hackrf-tools/src/hackrf_spiflash.c
@@ -313,15 +313,15 @@ int main(int argc, char** argv)
 			fd = NULL;
 			return EXIT_FAILURE;
 		}
-	} else {
-		result = hackrf_close(device);
-		if (result != HACKRF_SUCCESS) {
-			fprintf(stderr, "hackrf_close() failed: %s (%d)\n",
-					hackrf_error_name(result), result);
-			fclose(fd);
-			fd = NULL;
-			return EXIT_FAILURE;
-		}
+	}
+
+	result = hackrf_close(device);
+	if (result != HACKRF_SUCCESS) {
+		fprintf(stderr, "hackrf_close() failed: %s (%d)\n",
+				hackrf_error_name(result), result);
+		fclose(fd);
+		fd = NULL;
+		return EXIT_FAILURE;
 	}
 
 	hackrf_exit();