summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/rtd520.c
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-02-15 20:28:15 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:46 -0700
commit9a47b74a6fa2204025ba9a827578b840d2b3abcb (patch)
tree535ec597571e358f5891fa53af6d61e025c383a5 /drivers/staging/comedi/drivers/rtd520.c
parent7dcb582cd4b0c67e0053fbb87706bd0922d79027 (diff)
Staging: comedi: rtd520: &&/|| typo
Only error out on unexpected fifo size. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Dan Christian <dac@ptolemy.arc.nasa.gov> Cc: David Schleef <ds@schleef.org> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/rtd520.c')
-rw-r--r--drivers/staging/comedi/drivers/rtd520.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 65d5242a2585..6c7d54321f88 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1234,7 +1234,7 @@ static int rtd520_probe_fifo_depth(comedi_device *dev)
return -EIO;
}
RtdAdcClearFifo(dev);
- if(fifo_size != 0x400 || fifo_size != 0x2000)
+ if(fifo_size != 0x400 && fifo_size != 0x2000)
{
rt_printk("\ncomedi: %s: unexpected fifo size of %i, expected 1024 or 8192.\n",
DRV_NAME, fifo_size);