X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d251ef6bedadd20ea0f7d3b1923edfc23d772b3f..2178cbecb6cff2ee21a25c8dd44dc03f855aedab:/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
index 855ff7fcb..4858f0f62 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2018.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -461,6 +461,10 @@ bool XMEGANVM_EraseMemory(const uint8_t EraseCommand,
 	if (!(XMEGANVM_WaitWhileNVMBusBusy()))
 	  return false;
 
+	/* Wait until the NVM controller is no longer busy */
+	if (!(XMEGANVM_WaitWhileNVMControllerBusy()))
+	  return false;
+
 	return true;
 }