From 005c8bb2ea9ed308858b48fe504354b3f43fd971 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Mon, 30 Jul 2012 23:07:16 +0200
Subject: [PATCH] --- yaml --- r: 324512 b: refs/heads/master c:
 18978952c1815c0d6c25f0d8849c67204074b3e2 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 927b22594025..d8bd5ae74063 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f553646a67cb215577402cb702b67c8cf8fdb46f
+refs/heads/master: 18978952c1815c0d6c25f0d8849c67204074b3e2
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 31929ef5332d..21c5ed6d14f9 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -73,7 +73,7 @@ static int ft1000_control(struct ft1000_device *ft1000dev, unsigned int pipe,
 	}
 
 	ret = usb_control_msg(ft1000dev->dev, pipe, request, requesttype,
-			      value, index, data, size, LARGE_TIMEOUT);
+			      value, index, data, size, timeout);
 
 	if (ret > 0)
 		ret = 0;