From fb3a4a2e0134b709e2b4b91cd6fbae1f4b9805c2 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Thu, 3 Feb 2011 11:07:50 +0100
Subject: [PATCH] --- yaml --- r: 235797 b: refs/heads/master c:
 857af455c8e7865a8a24047534a92e3d016da4ab h: refs/heads/master i:   235795:
 934f20174d67ebbd315100d805d5dcd163e6b99a v: v3

---
 [refs]                                        |  2 +-
 .../ft1000/ft1000-usb/ft1000_download.c       | 56 +++++++++----------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index fa6963c79af4..2153492b803d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7a7318b387ae4be24619fbac68ce5b5f5a7b7da
+refs/heads/master: 857af455c8e7865a8a24047534a92e3d016da4ab
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index 7a930f56ff46..0c69a68c5c4b 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -644,44 +644,42 @@ static void usb_dnld_complete (struct urb *urb)
 // Notes:
 //
 //---------------------------------------------------------------------------
-static u32 write_blk_fifo (struct ft1000_device *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length)
+static u32 write_blk_fifo(struct ft1000_device *ft1000dev, u16 **pUsFile,
+			  u8 **pUcFile, long word_length)
 {
-   u32 Status = STATUS_SUCCESS;
-   int byte_length;
-   long aligncnt;
-
-   byte_length = word_length * 4;
+	u32 Status = STATUS_SUCCESS;
+	int byte_length;
+	long aligncnt;
 
-   if (byte_length % 4)
-      aligncnt = 4 - (byte_length % 4);
-   else
-      aligncnt = 0;
-   byte_length += aligncnt;
+	byte_length = word_length * 4;
 
-   if (byte_length && ((byte_length % 64) == 0)) {
-      byte_length += 4;
-   }
+	if (byte_length % 4)
+		aligncnt = 4 - (byte_length % 4);
+	else
+		aligncnt = 0;
+	byte_length += aligncnt;
 
-   if (byte_length < 64)
-       byte_length = 68;
+	if (byte_length && ((byte_length % 64) == 0))
+		byte_length += 4;
 
+	if (byte_length < 64)
+		byte_length = 68;
 
-    usb_init_urb(ft1000dev->tx_urb);
-    memcpy (ft1000dev->tx_buf, *pUcFile, byte_length);
-    usb_fill_bulk_urb(ft1000dev->tx_urb,
-                      ft1000dev->dev,
-                      usb_sndbulkpipe(ft1000dev->dev, ft1000dev->bulk_out_endpointAddr),
-                      ft1000dev->tx_buf,
-                      byte_length,
-                      usb_dnld_complete,
-                      (void*)ft1000dev);
+	usb_init_urb(ft1000dev->tx_urb);
+	memcpy(ft1000dev->tx_buf, *pUcFile, byte_length);
+	usb_fill_bulk_urb(ft1000dev->tx_urb,
+			  ft1000dev->dev,
+			  usb_sndbulkpipe(ft1000dev->dev,
+					  ft1000dev->bulk_out_endpointAddr),
+			  ft1000dev->tx_buf, byte_length, usb_dnld_complete,
+			  (void *)ft1000dev);
 
-    usb_submit_urb(ft1000dev->tx_urb, GFP_ATOMIC);
+	usb_submit_urb(ft1000dev->tx_urb, GFP_ATOMIC);
 
-   *pUsFile = *pUsFile + (word_length << 1);
-   *pUcFile = *pUcFile + (word_length << 2);
+	*pUsFile = *pUsFile + (word_length << 1);
+	*pUcFile = *pUcFile + (word_length << 2);
 
-   return Status;
+	return Status;
 }
 
 //---------------------------------------------------------------------------