aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/ft1000
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2012-07-30 23:07:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-13 19:28:58 -0700
commit18978952c1815c0d6c25f0d8849c67204074b3e2 (patch)
tree6e9b707639b9e2be5bdf9b8aca590e5f37dfe9ad /drivers/staging/ft1000
parentf553646a67cb215577402cb702b67c8cf8fdb46f (diff)
staging: ft1000: Fix ft1000_control function timeout argument usage.
Function ft1000_control have input argument timeout which was not passed to usb_control_msg instead hardcoded to LARGE_TIMEOUT. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ft1000')
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_hw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 31929ef5332..21c5ed6d14f 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/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;