Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[karo-tx-linux.git] / drivers / iio / industrialio-core.c

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index fd01f3493fc7792792d015c604903197ba506073..af7cc1e65656e1bf0ac83f561945bbbcf45d9de9 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -433,16 +433,15 @@ ssize_t iio_format_value(char *buf, unsigned int type, int size, int *vals)
                scale_db = true;
        case IIO_VAL_INT_PLUS_MICRO:
                if (vals[1] < 0)
-                       return sprintf(buf, "-%ld.%06u%s\n", abs(vals[0]),
-                                       -vals[1],
-                               scale_db ? " dB" : "");
+                       return sprintf(buf, "-%d.%06u%s\n", abs(vals[0]),
+                                      -vals[1], scale_db ? " dB" : "");
                else
                        return sprintf(buf, "%d.%06u%s\n", vals[0], vals[1],
                                scale_db ? " dB" : "");
        case IIO_VAL_INT_PLUS_NANO:
                if (vals[1] < 0)
-                       return sprintf(buf, "-%ld.%09u\n", abs(vals[0]),
-                                       -vals[1]);
+                       return sprintf(buf, "-%d.%09u\n", abs(vals[0]),
+                                      -vals[1]);
                else
                        return sprintf(buf, "%d.%09u\n", vals[0], vals[1]);
        case IIO_VAL_FRACTIONAL: