X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=ftdi%2Fftdi.c;fp=ftdi%2Fftdi.c;h=84f768a2d26911a554f88a8aaedd22761ee1b96a;hp=0c2314ac89b9f6f124ee2d526dbe282c2eb3b254;hb=4ece2c24d8ffb3ce77ae94effa657e49c1f536c2;hpb=6d9aa99f9e7077d8769d9d8375fe0a2856034242

diff --git a/ftdi/ftdi.c b/ftdi/ftdi.c
index 0c2314a..84f768a 100644
--- a/ftdi/ftdi.c
+++ b/ftdi/ftdi.c
@@ -276,10 +276,8 @@ int ftdi_read_data(struct ftdi_context *ftdi, unsigned char *buf, int size) {
 
 	// printf("Got bytes from buffer: %d\n", ftdi->readbuffer_remaining);
 
-	// Fix offsets
+	// Fix offset
 	offset += ftdi->readbuffer_remaining;
-	ftdi->readbuffer_remaining = 0;
-	ftdi->readbuffer_offset = 0;
     }
     
     // do the actual USB read
@@ -318,10 +316,11 @@ int ftdi_read_data(struct ftdi_context *ftdi, unsigned char *buf, int size) {
 
 		ftdi->readbuffer_offset += part_size;
 		ftdi->readbuffer_remaining = ret-part_size;
+		offset += part_size;
 		
 		// printf("Returning part: %d - size: %d - offset: %d - ret: %d - remaining: %d\n", part_size, size, offset, ret, ftdi->readbuffer_remaining);
 
-		return part_size;
+		return offset;
 	    }
 	}
     }