diff --git a/[refs] b/[refs]
index 5f1896cd8294..7c6ed40d019d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 677aaa430669861f39bd43c02bdbc2e8f7f7ad2c
+refs/heads/master: bcd2d92e62254320d012c8e879d651eeaa350661
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index 1797c4da91df..8e622425aa13 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -644,16 +644,9 @@ static u32 write_blk_fifo(struct ft1000_device *ft1000dev, u16 **pUsFile,
 {
 	u32 Status = STATUS_SUCCESS;
 	int byte_length;
-	long aligncnt;
 
 	byte_length = word_length * 4;
 
-	if (byte_length % 4)
-		aligncnt = 4 - (byte_length % 4);
-	else
-		aligncnt = 0;
-	byte_length += aligncnt;
-
 	if (byte_length && ((byte_length % 64) == 0))
 		byte_length += 4;