]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Staging: comedi: rtd520: &&/|| typo
authorRoel Kluin <roel.kluin@gmail.com>
Sun, 15 Feb 2009 19:28:15 +0000 (20:28 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Apr 2009 21:53:46 +0000 (14:53 -0700)
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>
drivers/staging/comedi/drivers/rtd520.c

index 65d5242a2585199bc80484e3d5ba0716713517bd..6c7d54321f88ac1ac4e408f7c4157e46b6e762b0 100644 (file)
@@ -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);