diff options
author | Mark Brown <broonie@kernel.org> | 2021-10-29 22:00:00 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-10-29 22:00:00 +0100 |
commit | 318a54c0ee4aaa3bfd69fdf505588510c7672c0c (patch) | |
tree | fcd342658639851179ab88c0eb317e83b586eb71 /drivers/iio/adc/rzg2l_adc.c | |
parent | 8e14329645bc7d722e1ec913025b54199fafaee3 (diff) | |
parent | 6195eb15f6d60dd92d1644dc11f1c1c2e84ebfeb (diff) | |
download | linux-318a54c0ee4aaa3bfd69fdf505588510c7672c0c.tar.bz2 |
Merge remote-tracking branch 'asoc/for-5.16' into asoc-next
Diffstat (limited to 'drivers/iio/adc/rzg2l_adc.c')
-rw-r--r-- | drivers/iio/adc/rzg2l_adc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iio/adc/rzg2l_adc.c b/drivers/iio/adc/rzg2l_adc.c index 9996d5eef289..32fbf57c362f 100644 --- a/drivers/iio/adc/rzg2l_adc.c +++ b/drivers/iio/adc/rzg2l_adc.c @@ -401,7 +401,7 @@ static int rzg2l_adc_hw_init(struct rzg2l_adc *adc) exit_hw_init: clk_disable_unprepare(adc->pclk); - return 0; + return ret; } static void rzg2l_adc_pm_runtime_disable(void *data) @@ -570,8 +570,10 @@ static int __maybe_unused rzg2l_adc_pm_runtime_resume(struct device *dev) return ret; ret = clk_prepare_enable(adc->adclk); - if (ret) + if (ret) { + clk_disable_unprepare(adc->pclk); return ret; + } rzg2l_adc_pwr(adc, true); |