summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/me_daq.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-02-10 11:49:45 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-14 09:28:46 -0800
commit22ca19d93d92c79cff68270846a84bd34fe6fb34 (patch)
tree1ec371d914a7b965130d658d4232f6d34ef85cb0 /drivers/staging/comedi/drivers/me_daq.c
parentf7b3d79a622c97483c8d0e6e4bbd5207929259d9 (diff)
staging: comedi: move (*insn_{read, write}) timeout debug messages to core
Have the comedi core display a standard dev_dbg() message when a timeout occurs and remove all the driver specific messages. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/me_daq.c')
-rw-r--r--drivers/staging/comedi/drivers/me_daq.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 288fb21b6f65..0ff126b1fdfd 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -305,10 +305,8 @@ static int me_ai_insn_read(struct comedi_device *dev,
/* wait for ADC fifo not empty flag */
ret = comedi_timeout(dev, s, insn, me_ai_eoc, 0);
- if (ret) {
- dev_err(dev->class_dev, "Cannot get single value\n");
+ if (ret)
return ret;
- }
/* get value from ADC fifo */
val = readw(dev_private->me_regbase + ME_READ_AD_FIFO);