]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
staging: ft1000: Fix ft1000_control function timeout argument usage.
authorMarek Belisko <marek.belisko@open-nandra.com>
Mon, 30 Jul 2012 21:07:16 +0000 (23:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Aug 2012 02:28:58 +0000 (19:28 -0700)
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>
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c

index 31929ef5332d3141c9559a53c744d3e5947b5314..21c5ed6d14f9fcd65ee55d0036496cccf126e7d3 100644 (file)
@@ -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;