]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: comedi: daqboard2000: change daqboard2000_write_cpld() return value
authorIan Abbott <abbotti@mev.co.uk>
Wed, 4 Jan 2017 10:55:39 +0000 (10:55 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Jan 2017 16:38:32 +0000 (17:38 +0100)
`daqboard2000_write_cpld()` currently returns 1 on success, or 0 on
failure.  Change it to return 0 on success, or `-EIO` on failure.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/daqboard2000.c

index f4c738037e283fcd4763a67108232766d38792b1..d6f30261db9b37b5c1d27dcaa380fb1a2dc2f018 100644 (file)
@@ -491,12 +491,12 @@ static int daqboard2000_wait_cpld_init(struct comedi_device *dev)
 
 static int daqboard2000_write_cpld(struct comedi_device *dev, u16 data)
 {
-       int result = 0;
+       int result = -EIO;
 
        usleep_range(10, 20);
        writew(data, dev->mmio + DB2K_REG_CPLD_WDATA);
        if (readw(dev->mmio + DB2K_REG_CPLD_STATUS) & DB2K_CPLD_STATUS_INIT)
-               result = 1;
+               result = 0;
 
        return result;
 }
@@ -547,10 +547,9 @@ static int daqboard2000_load_firmware(struct comedi_device *dev,
                for (; i < len; i += 2) {
                        u16 data = (cpld_array[i] << 8) + cpld_array[i + 1];
 
-                       if (!daqboard2000_write_cpld(dev, data)) {
-                               result = -EIO;
+                       result = daqboard2000_write_cpld(dev, data);
+                       if (result)
                                break;
-                       }
                }
                if (result == 0) {
                        daqboard2000_reset_local_bus(dev);