Commit b07c47bf authored by Nuno Sá's avatar Nuno Sá Committed by Jonathan Cameron

iio: ltc2983: Fix of_node refcounting

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: f110f318 ("iio: temperature: Add support for LTC2983")
Signed-off-by: default avatarNuno Sá <nuno.sa@analog.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200925091045.302-1-nuno.sa@analog.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent bbbeac88
...@@ -1285,18 +1285,20 @@ static int ltc2983_parse_dt(struct ltc2983_data *st) ...@@ -1285,18 +1285,20 @@ static int ltc2983_parse_dt(struct ltc2983_data *st)
ret = of_property_read_u32(child, "reg", &sensor.chan); ret = of_property_read_u32(child, "reg", &sensor.chan);
if (ret) { if (ret) {
dev_err(dev, "reg property must given for child nodes\n"); dev_err(dev, "reg property must given for child nodes\n");
return ret; goto put_child;
} }
/* check if we have a valid channel */ /* check if we have a valid channel */
if (sensor.chan < LTC2983_MIN_CHANNELS_NR || if (sensor.chan < LTC2983_MIN_CHANNELS_NR ||
sensor.chan > LTC2983_MAX_CHANNELS_NR) { sensor.chan > LTC2983_MAX_CHANNELS_NR) {
ret = -EINVAL;
dev_err(dev, dev_err(dev,
"chan:%d must be from 1 to 20\n", sensor.chan); "chan:%d must be from 1 to 20\n", sensor.chan);
return -EINVAL; goto put_child;
} else if (channel_avail_mask & BIT(sensor.chan)) { } else if (channel_avail_mask & BIT(sensor.chan)) {
ret = -EINVAL;
dev_err(dev, "chan:%d already in use\n", sensor.chan); 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", ret = of_property_read_u32(child, "adi,sensor-type",
...@@ -1304,7 +1306,7 @@ static int ltc2983_parse_dt(struct ltc2983_data *st) ...@@ -1304,7 +1306,7 @@ static int ltc2983_parse_dt(struct ltc2983_data *st)
if (ret) { if (ret) {
dev_err(dev, dev_err(dev,
"adi,sensor-type property must given for child nodes\n"); "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", dev_dbg(dev, "Create new sensor, type %u, chann %u",
...@@ -1334,13 +1336,15 @@ static int ltc2983_parse_dt(struct ltc2983_data *st) ...@@ -1334,13 +1336,15 @@ static int ltc2983_parse_dt(struct ltc2983_data *st)
st->sensors[chan] = ltc2983_adc_new(child, st, &sensor); st->sensors[chan] = ltc2983_adc_new(child, st, &sensor);
} else { } else {
dev_err(dev, "Unknown sensor type %d\n", sensor.type); dev_err(dev, "Unknown sensor type %d\n", sensor.type);
return -EINVAL; ret = -EINVAL;
goto put_child;
} }
if (IS_ERR(st->sensors[chan])) { if (IS_ERR(st->sensors[chan])) {
dev_err(dev, "Failed to create sensor %ld", dev_err(dev, "Failed to create sensor %ld",
PTR_ERR(st->sensors[chan])); PTR_ERR(st->sensors[chan]));
return PTR_ERR(st->sensors[chan]); ret = PTR_ERR(st->sensors[chan]);
goto put_child;
} }
/* set generic sensor parameters */ /* set generic sensor parameters */
st->sensors[chan]->chan = sensor.chan; st->sensors[chan]->chan = sensor.chan;
...@@ -1351,6 +1355,9 @@ static int ltc2983_parse_dt(struct ltc2983_data *st) ...@@ -1351,6 +1355,9 @@ static int ltc2983_parse_dt(struct ltc2983_data *st)
} }
return 0; return 0;
put_child:
of_node_put(child);
return ret;
} }
static int ltc2983_setup(struct ltc2983_data *st, bool assign_iio) static int ltc2983_setup(struct ltc2983_data *st, bool assign_iio)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment