lkml.org 
[lkml]   [2015]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 095/110] hwmon: (ntc_thermistor) Ensure iio channel is of type IIO_VOLTAGE
    Date
    3.16.7-ckt13 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Chris Lesiak <chris.lesiak@licor.com>

    commit adba657533bdd255f7b78bc8a324091f46b294cd upstream.

    When configured via device tree, the associated iio device needs to be
    measuring voltage for the conversion to resistance to be correct.
    Return -EINVAL if that is not the case.

    Signed-off-by: Chris Lesiak <chris.lesiak@licor.com>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/hwmon/ntc_thermistor.c | 9 +++++++++
    1 file changed, 9 insertions(+)

    diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c
    index ae66f42c4d6d..387ea83783df 100644
    --- a/drivers/hwmon/ntc_thermistor.c
    +++ b/drivers/hwmon/ntc_thermistor.c
    @@ -193,8 +193,10 @@ static struct ntc_thermistor_platform_data *
    ntc_thermistor_parse_dt(struct platform_device *pdev)
    {
    struct iio_channel *chan;
    + enum iio_chan_type type;
    struct device_node *np = pdev->dev.of_node;
    struct ntc_thermistor_platform_data *pdata;
    + int ret;

    if (!np)
    return NULL;
    @@ -207,6 +209,13 @@ ntc_thermistor_parse_dt(struct platform_device *pdev)
    if (IS_ERR(chan))
    return ERR_CAST(chan);

    + ret = iio_get_channel_type(chan, &type);
    + if (ret < 0)
    + return ERR_PTR(ret);
    +
    + if (type != IIO_VOLTAGE)
    + return ERR_PTR(-EINVAL);
    +
    if (of_property_read_u32(np, "pullup-uv", &pdata->pullup_uv))
    return ERR_PTR(-ENODEV);
    if (of_property_read_u32(np, "pullup-ohm", &pdata->pullup_ohm))

    \
     
     \ /
      Last update: 2015-06-05 16:21    [W:3.546 / U:0.544 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site