| From 9fe0f322894cc6b463517486068216ada4d21f3f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 7 Oct 2026 03:45:03 -0400 |
| Subject: iio: adc: aspeed: propagate reset deassert errors |
| |
| From: Pengpeng Hou <pengpeng@iscas.ac.cn> |
| |
| [ Upstream commit 95e4eb426b4bd666fa2f37886c0ddf74a0cc6167 ] |
| |
| aspeed_adc_probe() continues to register ADC resources after deasserting |
| the shared reset, even if the reset controller reports a failure. |
| |
| A failed deassertion leaves the hardware unavailable, so stop probing |
| before installing the cleanup action and enabling the ADC. |
| |
| Fixes: edf7550a1f93 ("iio: adc: aspeed: Deassert reset in probe") |
| Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Jonathan Cameron <jonathan.cameron@oss.qualcomm.com> |
| [ sashal: Replaced `return ret` with `goto reset_error` to accommodate manual clock cleanup. ] |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/iio/adc/aspeed_adc.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c |
| index 34ec0c28b2dff..012cc9291bef3 100644 |
| --- a/drivers/iio/adc/aspeed_adc.c |
| +++ b/drivers/iio/adc/aspeed_adc.c |
| @@ -221,7 +221,9 @@ static int aspeed_adc_probe(struct platform_device *pdev) |
| ret = PTR_ERR(data->rst); |
| goto reset_error; |
| } |
| - reset_control_deassert(data->rst); |
| + ret = reset_control_deassert(data->rst); |
| + if (ret) |
| + goto reset_error; |
| |
| model_data = of_device_get_match_data(&pdev->dev); |
| |
| -- |
| 2.53.0 |
| |
