diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 12:20:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 12:20:40 +0200 |
| commit | e8014d83f60479d3981baeaa3a21c993ff832f3f (patch) | |
| tree | 90af78aea1a518c4c04d123e1473e8c4c729c221 /drivers/iio/industrialio-core.c | |
| parent | 41aef04524d3dc8c2a5d9652cccc1f567356b5fd (diff) | |
| parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
Merge 5.7-rc3 into staging-next
We need the staging fixes in here too, and this resolves a merge issue
with the vt6656 driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/industrialio-core.c')
| -rw-r--r-- | drivers/iio/industrialio-core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 6add449b38bc..31d7664c5b4f 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -915,14 +915,11 @@ static ssize_t iio_write_channel_info(struct device *dev, return -EINVAL; integer = ch; } else { - ret = iio_str_to_fixpoint(buf, fract_mult, &integer, &fract); + ret = __iio_str_to_fixpoint(buf, fract_mult, &integer, &fract, + scale_db); if (ret) return ret; } - ret = __iio_str_to_fixpoint(buf, fract_mult, &integer, &fract, - scale_db); - if (ret) - return ret; ret = indio_dev->info->write_raw(indio_dev, this_attr->c, integer, fract, this_attr->address); |