From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 28 Jun 2014 15:37:41 +0000 (-0400)
Subject: 3.10-stable patches
X-Git-Tag: v3.4.96~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=508b85e7cd88334a3b93e08184129cf7fde8f57a;p=thirdparty%2Fkernel%2Fstable-queue.git

3.10-stable patches

added patches:
	usb-usbtest-add-timetout-to-simple_io.patch
---

diff --git a/queue-3.10/series b/queue-3.10/series
index 17b12d06994..ced7519e356 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -71,3 +71,4 @@ fs-btrfs-volumes.c-fix-for-possible-null-pointer-dereference.patch
 btrfs-use-right-type-to-get-real-comparison.patch
 btrfs-fix-scrub_print_warning-to-handle-skinny-metadata-extents.patch
 btrfs-fix-use-of-uninit-ret-in-end_extent_writepage.patch
+usb-usbtest-add-timetout-to-simple_io.patch
diff --git a/queue-3.10/usb-usbtest-add-timetout-to-simple_io.patch b/queue-3.10/usb-usbtest-add-timetout-to-simple_io.patch
new file mode 100644
index 00000000000..3bcf301aa92
--- /dev/null
+++ b/queue-3.10/usb-usbtest-add-timetout-to-simple_io.patch
@@ -0,0 +1,56 @@
+From e5e4746510d140261918aecce2e5e3aa4456f7e9 Mon Sep 17 00:00:00 2001
+From: Roger Quadros <rogerq@ti.com>
+Date: Wed, 18 Dec 2013 15:40:10 +0530
+Subject: usb: usbtest: Add timetout to simple_io()
+
+From: Roger Quadros <rogerq@ti.com>
+
+commit e5e4746510d140261918aecce2e5e3aa4456f7e9 upstream.
+
+Without a timetout some tests e.g. test_halt() can remain stuck forever.
+
+Signed-off-by: Roger Quadros <rogerq@ti.com>
+Reviewed-by: Felipe Balbi <balbi@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/misc/usbtest.c |   14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+--- a/drivers/usb/misc/usbtest.c
++++ b/drivers/usb/misc/usbtest.c
+@@ -10,6 +10,7 @@
+ #include <linux/timer.h>
+ #include <linux/usb.h>
+ 
++#define SIMPLE_IO_TIMEOUT	10000	/* in milliseconds */
+ 
+ /*-------------------------------------------------------------------------*/
+ 
+@@ -366,6 +367,7 @@ static int simple_io(
+ 	int			max = urb->transfer_buffer_length;
+ 	struct completion	completion;
+ 	int			retval = 0;
++	unsigned long		expire;
+ 
+ 	urb->context = &completion;
+ 	while (retval == 0 && iterations-- > 0) {
+@@ -378,9 +380,15 @@ static int simple_io(
+ 		if (retval != 0)
+ 			break;
+ 
+-		/* NOTE:  no timeouts; can't be broken out of by interrupt */
+-		wait_for_completion(&completion);
+-		retval = urb->status;
++		expire = msecs_to_jiffies(SIMPLE_IO_TIMEOUT);
++		if (!wait_for_completion_timeout(&completion, expire)) {
++			usb_kill_urb(urb);
++			retval = (urb->status == -ENOENT ?
++				  -ETIMEDOUT : urb->status);
++		} else {
++			retval = urb->status;
++		}
++
+ 		urb->dev = udev;
+ 		if (retval == 0 && usb_pipein(urb->pipe))
+ 			retval = simple_check_buf(tdev, urb);