From ce8e4741efcfa8b711a902c916a3aa6ecdc0ca72 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Mon, 27 Jun 2011 13:07:07 +0100 Subject: [PATCH] --- yaml --- r: 259590 b: refs/heads/master c: 71646e2c7ae4edb92dfa89eccb354d81be1cbbbd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/iio.h | 1 + trunk/drivers/staging/iio/industrialio-core.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0e66082b2323..224398f5825c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6263ba551985ad7201d0e7f36672c7a0f57f61f4 +refs/heads/master: 71646e2c7ae4edb92dfa89eccb354d81be1cbbbd diff --git a/trunk/drivers/staging/iio/iio.h b/trunk/drivers/staging/iio/iio.h index 38f1425f4645..78a0927c9fdf 100644 --- a/trunk/drivers/staging/iio/iio.h +++ b/trunk/drivers/staging/iio/iio.h @@ -202,6 +202,7 @@ static inline s64 iio_get_time_ns(void) * call to iio_device_register. */ #define IIO_VAL_INT 1 #define IIO_VAL_INT_PLUS_MICRO 2 +#define IIO_VAL_INT_PLUS_NANO 3 /** * struct iio_info - constant information about device diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c index 94d3bfaa061d..e5a7663613a7 100644 --- a/trunk/drivers/staging/iio/industrialio-core.c +++ b/trunk/drivers/staging/iio/industrialio-core.c @@ -396,6 +396,11 @@ static ssize_t iio_read_channel_info(struct device *dev, return sprintf(buf, "-%d.%06u\n", val, -val2); else return sprintf(buf, "%d.%06u\n", val, val2); + } else if (ret == IIO_VAL_INT_PLUS_NANO) { + if (val2 < 0) + return sprintf(buf, "-%d.%09u\n", val, -val2); + else + return sprintf(buf, "%d.%09u\n", val, val2); } else return 0; }