fxload putting code at a wrong place

[lochegm1@cti.ecp.fr (Matthieu Lochegnies)]

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

  High !

  I just bought an Ez USB development kit and tried to play with it
using fxload. The new merging algorithm seems to forget to initialize
data_addr.

  Attached is a small patch that, I think, fixes it.

  Regards,

-- 
Matthieu Lochegnies

[-- Attachment #2: ezusb.pch --]
[-- Type: text/plain, Size: 786 bytes --]

Index: ezusb.c
===================================================================
RCS file: /cvsroot/linux-hotplug/admin/fxload/ezusb.c,v
retrieving revision 1.3
diff -u -r1.3 ezusb.c
--- ezusb.c	2001/12/27 17:59:33	1.3
+++ ezusb.c	2002/01/17 08:33:28
@@ -130,6 +130,7 @@
       FILE*image;
       int rc;
       unsigned short cpucs_addr;
+      unsigned char first_line = 1;
 
       /* EZ-USB FX and FX2 devices differ, apart from the 8051 core */
       if (fx2)
@@ -186,6 +187,13 @@
 	    buf[7] = 0;
 	    off = strtoul(buf+3, 0, 16);
 	    buf[7] = tmp;
+
+              /* Initialize data_addr */
+            if( first_line )
+            {
+              data_addr = off;
+              first_line = 0;
+            }
 
 	      /* Read the record type */
 	    tmp = buf[9];