From: Greg Kroah-Hartman Date: Mon, 23 Sep 2013 21:22:02 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.0.97~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=843aed21d03f91a566602b9727c807ca70d8f21b;p=thirdparty%2Fkernel%2Fstable-queue.git 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 dcc8cefd0f5..bf8a73bd24b 100644 --- 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 index 00000000000..bd41ee7d7d2 --- /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 +Date: Tue, 20 Aug 2013 11:57:35 +0300 +Subject: staging: comedi: dt282x: dt282x_ai_insn_read() always fails + +From: Dan Carpenter + +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 +Acked-by: Ian Abbott +Signed-off-by: Greg Kroah-Hartman + +--- + 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,