3.4-stable patches

added patches:
	staging-comedi-dt282x-dt282x_ai_insn_read-always-fails.patch

diff --git a/queue-3.4/series b/queue-3.4/series
index dcc8cefd0f59493832951539b3622e2e27995f23..bf8a73bd24b512072c0c720d50a00355d045583f 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -6,3 +6,4 @@ arm-pci-versatile-fix-smap-register-offsets.patch
 xhci-plat-don-t-enable-legacy-pci-interrupts.patch
 usb-xhci-disable-runtime-pm-suspend-for-quirky-controllers.patch
 cifs-ensure-that-srv_mutex-is-held-when-dealing-with-ssocket-pointer.patch
+staging-comedi-dt282x-dt282x_ai_insn_read-always-fails.patch

diff --git a/queue-3.4/staging-comedi-dt282x-dt282x_ai_insn_read-always-fails.patch b/queue-3.4/staging-comedi-dt282x-dt282x_ai_insn_read-always-fails.patch
new file mode 100644 (file)
index 0000000..bd41ee7
--- /dev/null
+++ b/queue-3.4/staging-comedi-dt282x-dt282x_ai_insn_read-always-fails.patch
@@ -0,0 +1,35 @@
+From 2c4283ca7cdcc6605859c836fc536fcd83a4525f Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Tue, 20 Aug 2013 11:57:35 +0300
+Subject: staging: comedi: dt282x: dt282x_ai_insn_read() always fails
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit 2c4283ca7cdcc6605859c836fc536fcd83a4525f upstream.
+
+In dt282x_ai_insn_read() we call this macro like:
+wait_for(!mux_busy(), comedi_error(dev, "timeout\n"); return -ETIME;);
+Because the if statement doesn't have curly braces it means we always
+return -ETIME and the function never succeeds.
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Acked-by: Ian Abbott <abbotti@mev.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/staging/comedi/drivers/dt282x.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/staging/comedi/drivers/dt282x.c
++++ b/drivers/staging/comedi/drivers/dt282x.c
+@@ -407,8 +407,9 @@ struct dt282x_private {
+                       }                                       \
+                       udelay(5);                              \
+               }                                               \
+-              if (_i)                                         \
++              if (_i) {                                       \
+                       b                                       \
++              }                                               \
+       } while (0)
+ 
+ static int dt282x_attach(struct comedi_device *dev,