summaryrefslogtreecommitdiffstats
path: root/drivers/iio/dac
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-17 08:31:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-17 08:31:12 +0200
commit20460472952043a4735e9abc1fd9de8e024d1c9e (patch)
tree8a9f91828816c3cb3b8fc019dce28d128e13dfef /drivers/iio/dac
parentMerge tag 'iio-for-6.11a' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/g... (diff)
parentLinux 6.10-rc4 (diff)
downloadlinux-20460472952043a4735e9abc1fd9de8e024d1c9e.tar.xz
linux-20460472952043a4735e9abc1fd9de8e024d1c9e.zip
Merge tag 'v6.10-rc4' into char-misc-next
We need the char-misc and iio fixes in here as well to build on top of. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/dac')
-rw-r--r--drivers/iio/dac/ad5592r-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c
index 076bc9ecfb49..4763402dbcd6 100644
--- a/drivers/iio/dac/ad5592r-base.c
+++ b/drivers/iio/dac/ad5592r-base.c
@@ -415,7 +415,7 @@ static int ad5592r_read_raw(struct iio_dev *iio_dev,
s64 tmp = *val * (3767897513LL / 25LL);
*val = div_s64_rem(tmp, 1000000000LL, val2);
- return IIO_VAL_INT_PLUS_MICRO;
+ return IIO_VAL_INT_PLUS_NANO;
}
mutex_lock(&st->lock);