aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-20 11:57:35 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-21 10:07:17 -0700
commit2c4283ca7cdcc6605859c836fc536fcd83a4525f (patch)
tree7d7ea96487cd7dcba0fba4bec50757262b3f5133 /drivers/staging/comedi
parentstaging: comedi: usbdux: allocating too much data (diff)
downloadlinux-dev-2c4283ca7cdcc6605859c836fc536fcd83a4525f.tar.xz
linux-dev-2c4283ca7cdcc6605859c836fc536fcd83a4525f.zip
staging: comedi: dt282x: dt282x_ai_insn_read() always fails
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> Cc: stable <stable@vger.kernel.org> # 2.6.36+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/dt282x.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c
index 23cb033559b3..4a25382e9b86 100644
--- a/drivers/staging/comedi/drivers/dt282x.c
+++ b/drivers/staging/comedi/drivers/dt282x.c
@@ -267,8 +267,9 @@ struct dt282x_private {
} \
udelay(5); \
} \
- if (_i) \
+ if (_i) { \
b \
+ } \
} while (0)
static int prep_ai_dma(struct comedi_device *dev, int chan, int size);