lkml.org 
[lkml]   [2020]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 268/391] iio: ltc2983: Fix of_node refcounting
    Date
    From: Nuno Sá <nuno.sa@analog.com>

    commit b07c47bfab6f5c4c7182d23e854bbceaf7829c85 upstream.

    When returning or breaking early from a
    `for_each_available_child_of_node()` loop, we need to explicitly call
    `of_node_put()` on the child node to possibly release the node.

    Fixes: f110f3188e563 ("iio: temperature: Add support for LTC2983")
    Signed-off-by: Nuno Sá <nuno.sa@analog.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20200925091045.302-1-nuno.sa@analog.com
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/iio/temperature/ltc2983.c | 19 +++++++++++++------
    1 file changed, 13 insertions(+), 6 deletions(-)

    --- a/drivers/iio/temperature/ltc2983.c
    +++ b/drivers/iio/temperature/ltc2983.c
    @@ -1285,18 +1285,20 @@ static int ltc2983_parse_dt(struct ltc29
    ret = of_property_read_u32(child, "reg", &sensor.chan);
    if (ret) {
    dev_err(dev, "reg property must given for child nodes\n");
    - return ret;
    + goto put_child;
    }

    /* check if we have a valid channel */
    if (sensor.chan < LTC2983_MIN_CHANNELS_NR ||
    sensor.chan > LTC2983_MAX_CHANNELS_NR) {
    + ret = -EINVAL;
    dev_err(dev,
    "chan:%d must be from 1 to 20\n", sensor.chan);
    - return -EINVAL;
    + goto put_child;
    } else if (channel_avail_mask & BIT(sensor.chan)) {
    + ret = -EINVAL;
    dev_err(dev, "chan:%d already in use\n", sensor.chan);
    - return -EINVAL;
    + goto put_child;
    }

    ret = of_property_read_u32(child, "adi,sensor-type",
    @@ -1304,7 +1306,7 @@ static int ltc2983_parse_dt(struct ltc29
    if (ret) {
    dev_err(dev,
    "adi,sensor-type property must given for child nodes\n");
    - return ret;
    + goto put_child;
    }

    dev_dbg(dev, "Create new sensor, type %u, chann %u",
    @@ -1334,13 +1336,15 @@ static int ltc2983_parse_dt(struct ltc29
    st->sensors[chan] = ltc2983_adc_new(child, st, &sensor);
    } else {
    dev_err(dev, "Unknown sensor type %d\n", sensor.type);
    - return -EINVAL;
    + ret = -EINVAL;
    + goto put_child;
    }

    if (IS_ERR(st->sensors[chan])) {
    dev_err(dev, "Failed to create sensor %ld",
    PTR_ERR(st->sensors[chan]));
    - return PTR_ERR(st->sensors[chan]);
    + ret = PTR_ERR(st->sensors[chan]);
    + goto put_child;
    }
    /* set generic sensor parameters */
    st->sensors[chan]->chan = sensor.chan;
    @@ -1351,6 +1355,9 @@ static int ltc2983_parse_dt(struct ltc29
    }

    return 0;
    +put_child:
    + of_node_put(child);
    + return ret;
    }

    static int ltc2983_setup(struct ltc2983_data *st, bool assign_iio)

    \
     
     \ /
      Last update: 2020-11-03 22:50    [W:4.108 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site