5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pengpeng Hou [ 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 Cc: stable@vger.kernel.org Signed-off-by: Jonathan Cameron [ sashal: Replaced `return ret` with `goto reset_error` to accommodate manual clock cleanup. ] Signed-off-by: Sasha Levin --- 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