From: Haotian Zhang <vulab@iscas.ac.cn>
To: David Lechner <dlechner@baylibre.com>
Cc: "Matthias Brugger" <matthias.bgg@gmail.com>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
"Nuno Sá" <nuno.sa@analog.com>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org,
"Haotian Zhang" <vulab@iscas.ac.cn>
Subject: [PATCH] iio: adc: mt6360: Handle error in cleanup path correctly
Date: Mon, 29 Sep 2025 10:53:58 +0800 [thread overview]
Message-ID: <20250929025358.2064-1-vulab@iscas.ac.cn> (raw)
The return value of a regmap_raw_write() in the cleanup path was
being ignored.
Fix this by checking the return value and propagating the error.
Fixes: 1f4877218f7e ("iio: adc: mt6360: Add ADC driver for MT6360")
Signed-off-by: Haotian Zhang <vulab@iscas.ac.cn>
---
drivers/iio/adc/mt6360-adc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/adc/mt6360-adc.c b/drivers/iio/adc/mt6360-adc.c
index 69b3569c90e5..97c4af8a93fc 100644
--- a/drivers/iio/adc/mt6360-adc.c
+++ b/drivers/iio/adc/mt6360-adc.c
@@ -70,6 +70,7 @@ static int mt6360_adc_read_channel(struct mt6360_adc_data *mad, int channel, int
ktime_t predict_end_t, timeout;
unsigned int pre_wait_time;
int ret;
+ int cleanup_ret;
mutex_lock(&mad->adc_lock);
@@ -130,11 +131,15 @@ static int mt6360_adc_read_channel(struct mt6360_adc_data *mad, int channel, int
out_adc_conv:
/* Only keep ADC enable */
adc_enable = cpu_to_be16(MT6360_ADCEN_MASK);
- regmap_raw_write(mad->regmap, MT6360_REG_PMUADCCFG, &adc_enable, sizeof(adc_enable));
+ cleanup_ret = regmap_raw_write(mad->regmap, MT6360_REG_PMUADCCFG,
+ &adc_enable, sizeof(adc_enable));
+ if (ret >= 0)
+ ret = cleanup_ret;
mad->last_off_timestamps[channel] = ktime_get();
/* Config prefer channel to NO_PREFER */
regmap_update_bits(mad->regmap, MT6360_REG_PMUADCRPT1, MT6360_PREFERCH_MASK,
MT6360_NO_PREFER << MT6360_PREFERCH_SHFT);
+
out_adc_lock:
mutex_unlock(&mad->adc_lock);
--
2.50.1.windows.1
next reply other threads:[~2025-09-29 2:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-29 2:53 Haotian Zhang [this message]
2025-09-29 15:26 ` [PATCH] iio: adc: mt6360: Handle error in cleanup path correctly David Lechner
2025-09-29 16:24 ` [PATCH v2] " Haotian Zhang
2025-10-04 14:31 ` 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=20250929025358.2064-1-vulab@iscas.ac.cn \
--to=vulab@iscas.ac.cn \
--cc=Jonathan.Cameron@huawei.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=dlechner@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=nuno.sa@analog.com \
/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