From 3216fa7a37ddf96d46c479216ac629b2439a7510 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Thu, 3 Feb 2011 11:07:46 +0100
Subject: [PATCH] --- yaml --- r: 235793 b: refs/heads/master c:
 114a06ae848a1ca718f3e2ab077bddb15e576991 h: refs/heads/master i:   235791:
 9ba2b42a2fda65d23c53e80fcb2f38953b6ac0cc v: v3

---
 [refs]                                        |  2 +-
 .../ft1000/ft1000-usb/ft1000_download.c       | 38 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 51dedc312797..0e98727871e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3ed5d2f25b89b67011f2883a141c5115eef415b
+refs/heads/master: 114a06ae848a1ca718f3e2ab077bddb15e576991
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index 7496ad8732a6..223c0471ccc2 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -406,30 +406,26 @@ static u16 get_request_type_usb(struct ft1000_device *ft1000dev)
 //---------------------------------------------------------------------------
 static long get_request_value(struct ft1000_device *ft1000dev)
 {
-   u32     value;
-   u16   tempword;
-   u32    status;
+	u32 value;
+	u16 tempword;
+	u32 status;
 	struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
 
+	if (pft1000info->bootmode == 1) {
+		status = fix_ft1000_read_dpram32(ft1000dev,
+				DWNLD_MAG1_SIZE_LOC, (u8 *)&value);
+		value = ntohl(value);
+	} else	{
+		status = ft1000_read_dpram16(ft1000dev,
+				DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 0);
+		value = tempword;
+		status = ft1000_read_dpram16(ft1000dev,
+				DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 1);
+		value |= (tempword << 16);
+		value = ntohl(value);
+	}
 
-       if ( pft1000info->bootmode == 1)
-       {
-	   status = fix_ft1000_read_dpram32(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&value);
-	   value = ntohl(value);
-       }
-       else
-       {
-	   status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 0);
-	   value = tempword;
-           status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 1);
-	   value |= (tempword << 16);
-	   value = ntohl(value);
-       }
-
-
-   //DEBUG("get_request_value: value is %x\n", value);
-   return value;
-
+	return value;
 }