From d753dc69058e70a43685749925b5fd8b8088cee1 Mon Sep 17 00:00:00 2001
From: hweisbach <hweisbach@81a1dc3b-b13d-400b-aceb-764788c761c2>
Date: Thu, 2 May 2013 11:07:07 +0000
Subject: [PATCH] avrftdi.c: Fix wrong loop invariant in write_flush()

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1152 81a1dc3b-b13d-400b-aceb-764788c761c2
---
 avrftdi.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/avrftdi.c b/avrftdi.c
index 4bb3ba7f..ff42f6a4 100644
--- a/avrftdi.c
+++ b/avrftdi.c
@@ -650,26 +650,19 @@ static int write_flush(avrftdi_t* pdata)
 	//E(ftdi_usb_purge_buffers(pdata->ftdic), pdata->ftdic);
 
 	unsigned char cmd[] = { GET_BITS_LOW, SEND_IMMEDIATE };
-	unsigned int n;
-	int retries = 0;
-	int num = 0;
 	E(ftdi_write_data(pdata->ftdic, cmd, sizeof(cmd)) != sizeof(cmd), pdata->ftdic);
+	
+	int num = 0;
 	do
 	{
-		n = ftdi_read_data(pdata->ftdic, cmd, 1);
+		int n = ftdi_read_data(pdata->ftdic, buf, sizeof(buf));
 		if(n > 0)
-		{
-			avrftdi_print(0, "Low byte lines: 0x%02x\n", cmd[0]);
 			num += n;
-		}
-		if(!n)
-		{
-			retries++;
-		}
 		E(n < 0, pdata->ftdic);
-	} while(retries < 1/*n < 1*/);
+	} while(num < 1);
 	
-	avrftdi_print(0, "Read %d extra bytes\n", num-1);
+	if(num > 1)
+		log_warn("Read %d extra bytes\n", num-1);
 #endif
 
 	return 0;
@@ -1302,7 +1295,6 @@ avrftdi_setup(PROGRAMMER * pgm)
 static void
 avrftdi_teardown(PROGRAMMER * pgm)
 {
-	fprintf(stderr, "\n%s: Unintializing programmer.\n", progname);
 	avrftdi_t* pdata = to_pdata(pgm);
 
 	if(pdata) {