Index: cifXDownload.c
===================================================================
--- cifXDownload.c	(revision 7533)
+++ cifXDownload.c	(working copy)
@@ -12,6 +12,8 @@
   Changes:
     Date        Description
     -----------------------------------------------------------------------------------
+    2016-04-05  DEV_ProcessFWDownload(): DEV_RemoveChannelFiles() repeatedly called with
+                channel 0 when downloading firmware (nxf) to flash based devices
     2015-12-22  Changed md5.h to hilmd5.h
     2015-07-21  Fixed compiler warnings created by implicit data conversion on 64bit systems
     2012-12-11  Zero'ing local variables now done using OS_Memset to prevent compiler from
@@ -853,7 +855,7 @@
             /* Remove ALL files */
             for ( ulChNum = 0; ulChNum < CIFX_MAX_NUMBER_OF_CHANNELS; ulChNum++)
             {
-              DEV_RemoveChannelFiles(ptSysDevice, ulChannel, pfnTransferPacket, NULL, NULL, NULL);
+              DEV_RemoveChannelFiles(ptSysDevice, ulChNum, pfnTransferPacket, NULL, NULL, NULL);
             }
 
             /* We have loaded a new firmware file */