lkml.org 
[lkml]   [2019]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 08/50] iio: chemical: atlas-ph-sensor: correct IIO_TEMP values to millicelsius
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Matt Ranostay <matt.ranostay@konsulko.com>

    commit 0808831dc62e90023ad14ff8da4804c7846e904b upstream.

    IIO_TEMP scale value for temperature was incorrect and not in millicelsius
    as required by the ABI documentation.

    Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
    Fixes: 27dec00ecf2d (iio: chemical: add Atlas pH-SM sensor support)
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/iio/chemical/atlas-ph-sensor.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    --- a/drivers/iio/chemical/atlas-ph-sensor.c
    +++ b/drivers/iio/chemical/atlas-ph-sensor.c
    @@ -444,9 +444,8 @@ static int atlas_read_raw(struct iio_dev
    case IIO_CHAN_INFO_SCALE:
    switch (chan->type) {
    case IIO_TEMP:
    - *val = 1; /* 0.01 */
    - *val2 = 100;
    - break;
    + *val = 10;
    + return IIO_VAL_INT;
    case IIO_PH:
    *val = 1; /* 0.001 */
    *val2 = 1000;
    @@ -477,7 +476,7 @@ static int atlas_write_raw(struct iio_de
    int val, int val2, long mask)
    {
    struct atlas_data *data = iio_priv(indio_dev);
    - __be32 reg = cpu_to_be32(val);
    + __be32 reg = cpu_to_be32(val / 10);

    if (val2 != 0 || val < 0 || val > 20000)
    return -EINVAL;

    \
     
     \ /
      Last update: 2019-02-13 19:48    [W:4.038 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site