---

yaml --- r: 324512 b: refs/heads/master c: 1897895 h: refs/heads/master v: v3
git-mirror · Aug 14, 2012 · 005c8bb · 005c8bb
1 parent aa57f68
commit 005c8bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;