Merge 3.16-rc2 into staging-next

We want the staging fixes here as well.

1 files changed, 15 insertions, 1 deletions

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 51a6da256772..829f446064ea 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -7,7 +7,7 @@
 #include <linux/moduleparam.h>
 #include <linux/scatterlist.h>
 #include <linux/mutex.h>
-
+#include <linux/timer.h>
 #include <linux/usb.h>
 
 #define SIMPLE_IO_TIMEOUT       10000   /* in milliseconds */
@@ -484,6 +484,14 @@ alloc_sglist(int nents, int max, int vary)
         return sg;
 }
 
+static void sg_timeout(unsigned long _req)
+{
+        struct usb_sg_request   *req = (struct usb_sg_request *) _req;
+
+        req->status = -ETIMEDOUT;
+        usb_sg_cancel(req);
+}
+
 static int perform_sglist(
         struct usbtest_dev      *tdev,
         unsigned                iterations,
@@ -495,6 +503,9 @@ static int perform_sglist(
 {
         struct usb_device       *udev = testdev_to_usbdev(tdev);
         int                     retval = 0;
+        struct timer_list       sg_timer;
+
+        setup_timer_on_stack(&sg_timer, sg_timeout, (unsigned long) req);
 
         while (retval == 0 && iterations-- > 0) {
                 retval = usb_sg_init(req, udev, pipe,
@@ -505,7 +516,10 @@ static int perform_sglist(
 
                 if (retval)
                         break;
+                mod_timer(&sg_timer, jiffies +
+                                msecs_to_jiffies(SIMPLE_IO_TIMEOUT));
                 usb_sg_wait(req);
+                del_timer_sync(&sg_timer);
                 retval = req->status;
 
                 /* FIXME check resulting data pattern */