* [PATCH v1 1/1] iio: dac: ad5770r: Put fwnode in error case during ->probe()
@ 2021-05-10 9:56 Andy Shevchenko
2021-05-12 17:33 ` Alexandru Ardelean
0 siblings, 1 reply; 3+ messages in thread
From: Andy Shevchenko @ 2021-05-10 9:56 UTC (permalink / raw)
To: Jonathan Cameron, Andy Shevchenko, linux-iio, linux-kernel
Cc: Lars-Peter Clausen, Michael Hennerich, Jonathan Cameron,
Alexandru Tachici
device_for_each_child_node() bumps a reference counting of a returned variable.
We have to balance it whenever we return to the caller.
Fixes: cbbb819837f6 ("iio: dac: ad5770r: Add AD5770R support")
Cc: Alexandru Tachici <alexandru.tachici@analog.com>
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/iio/dac/ad5770r.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/dac/ad5770r.c b/drivers/iio/dac/ad5770r.c
index 7ab2ccf90863..8107f7bbbe3c 100644
--- a/drivers/iio/dac/ad5770r.c
+++ b/drivers/iio/dac/ad5770r.c
@@ -524,23 +524,29 @@ static int ad5770r_channel_config(struct ad5770r_state *st)
device_for_each_child_node(&st->spi->dev, child) {
ret = fwnode_property_read_u32(child, "num", &num);
if (ret)
- return ret;
- if (num >= AD5770R_MAX_CHANNELS)
- return -EINVAL;
+ goto err_child_out;
+ if (num >= AD5770R_MAX_CHANNELS) {
+ ret = -EINVAL;
+ goto err_child_out;
+ }
ret = fwnode_property_read_u32_array(child,
"adi,range-microamp",
tmp, 2);
if (ret)
- return ret;
+ goto err_child_out;
min = tmp[0] / 1000;
max = tmp[1] / 1000;
ret = ad5770r_store_output_range(st, min, max, num);
if (ret)
- return ret;
+ goto err_child_out;
}
+ return 0;
+
+err_child_out:
+ fwnode_handle_put(child);
return ret;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v1 1/1] iio: dac: ad5770r: Put fwnode in error case during ->probe()
2021-05-10 9:56 [PATCH v1 1/1] iio: dac: ad5770r: Put fwnode in error case during ->probe() Andy Shevchenko
@ 2021-05-12 17:33 ` Alexandru Ardelean
[not found] ` <CAHp75VfFTnS6+6KwqixTXNsMvC_LWGnY0rv3n9g_-i7HK2eq0w@mail.gmail.com>
0 siblings, 1 reply; 3+ messages in thread
From: Alexandru Ardelean @ 2021-05-12 17:33 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Jonathan Cameron, linux-iio, LKML, Lars-Peter Clausen,
Michael Hennerich, Jonathan Cameron, Alexandru Tachici
On Mon, May 10, 2021 at 12:59 PM Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
>
> device_for_each_child_node() bumps a reference counting of a returned variable.
> We have to balance it whenever we return to the caller.
This feels like the device_for_each_child_node() [and the of_node
variant] iterator[s] need[s] some re-design to account for how easy it
is to slip stuff by.
But that's something quite out of this scope.
Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com>
>
> Fixes: cbbb819837f6 ("iio: dac: ad5770r: Add AD5770R support")
> Cc: Alexandru Tachici <alexandru.tachici@analog.com>
> Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> ---
> drivers/iio/dac/ad5770r.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/dac/ad5770r.c b/drivers/iio/dac/ad5770r.c
> index 7ab2ccf90863..8107f7bbbe3c 100644
> --- a/drivers/iio/dac/ad5770r.c
> +++ b/drivers/iio/dac/ad5770r.c
> @@ -524,23 +524,29 @@ static int ad5770r_channel_config(struct ad5770r_state *st)
> device_for_each_child_node(&st->spi->dev, child) {
> ret = fwnode_property_read_u32(child, "num", &num);
> if (ret)
> - return ret;
> - if (num >= AD5770R_MAX_CHANNELS)
> - return -EINVAL;
> + goto err_child_out;
> + if (num >= AD5770R_MAX_CHANNELS) {
> + ret = -EINVAL;
> + goto err_child_out;
> + }
>
> ret = fwnode_property_read_u32_array(child,
> "adi,range-microamp",
> tmp, 2);
> if (ret)
> - return ret;
> + goto err_child_out;
>
> min = tmp[0] / 1000;
> max = tmp[1] / 1000;
> ret = ad5770r_store_output_range(st, min, max, num);
> if (ret)
> - return ret;
> + goto err_child_out;
> }
>
> + return 0;
> +
> +err_child_out:
> + fwnode_handle_put(child);
> return ret;
> }
>
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-13 17:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-10 9:56 [PATCH v1 1/1] iio: dac: ad5770r: Put fwnode in error case during ->probe() Andy Shevchenko
2021-05-12 17:33 ` Alexandru Ardelean
[not found] ` <CAHp75VfFTnS6+6KwqixTXNsMvC_LWGnY0rv3n9g_-i7HK2eq0w@mail.gmail.com>
2021-05-13 17:09 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).