From: Zhang Qilong <zhangqilong3@huawei.com>
To: <jic23@kernel.org>, <lars@metafoo.de>, <wens@csie.org>,
<jernej.skrabec@gmail.com>, <samuel@sholland.org>
Cc: <linux-iio@vger.kernel.org>, <linux-sunxi@lists.linux.dev>
Subject: [PATCH v2 2/2] iio: adc: sun4i-gpadc-iio: Fix error handle when devm_iio_device_register() failed in sun4i_gpadc_probe()
Date: Thu, 20 Oct 2022 20:40:45 +0800 [thread overview]
Message-ID: <20221020124045.77678-3-zhangqilong3@huawei.com> (raw)
In-Reply-To: <20221020124045.77678-1-zhangqilong3@huawei.com>
If devm_iio_device_register() failed, the thermal_zone may have been
registered. So we need call thermal_zone_of_sensor_unregister() when
CONFIG_THERMAL_OF is enabled. We fix it by adding a err_register and
gotoing it when devm_iio_device_register() failed.
Fixes: d1caa9905538 ("iio: adc: add support for Allwinner SoCs ADC")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
---
drivers/iio/adc/sun4i-gpadc-iio.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
index d2535dd28af8..04717571cb2e 100644
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
@@ -656,11 +656,17 @@ static int sun4i_gpadc_probe(struct platform_device *pdev)
ret = devm_iio_device_register(&pdev->dev, indio_dev);
if (ret < 0) {
dev_err(&pdev->dev, "could not register the device\n");
- goto err_map;
+ goto err_register;
}
return 0;
+err_register:
+ if (IS_ENABLED(CONFIG_THERMAL_OF)) {
+ devm_thermal_of_zone_unregister(info->sensor_device,
+ info->tzd);
+ info->tzd = NULL;
+ }
err_map:
if (!info->no_irq && IS_ENABLED(CONFIG_THERMAL_OF))
iio_map_array_unregister(indio_dev);
--
2.25.1
next prev parent reply other threads:[~2022-10-20 12:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-20 12:40 [PATCH v2 0/2] iio: adc: sun4i-gpadc-iio: Fix error handle in sun4i_gpadc_probe() Zhang Qilong
2022-10-20 12:40 ` [PATCH v2 1/2] iio: adc: sun4i-gpadc-iio: Fix PM disable depth imbalance " Zhang Qilong
2022-10-23 12:31 ` Jonathan Cameron
2022-10-20 12:40 ` Zhang Qilong [this message]
2022-10-23 12:29 ` [PATCH v2 2/2] iio: adc: sun4i-gpadc-iio: Fix error handle when devm_iio_device_register() failed " Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221020124045.77678-3-zhangqilong3@huawei.com \
--to=zhangqilong3@huawei.com \
--cc=jernej.skrabec@gmail.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=samuel@sholland.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox