Merge tag 'for-linus-20170825' of git://git.infradead.org/linux-mtd

[mirror_ubuntu-artful-kernel.git] / drivers / iio / adc / aspeed_adc.c

diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c
index 87fd6e0ce5ee000e871934b1ebeeb8221dd20039..c02b23d675cbc1540ec47769515da714c784cf67 100644 (file)
--- a/drivers/iio/adc/aspeed_adc.c
+++ b/drivers/iio/adc/aspeed_adc.c
@@ -237,7 +237,10 @@ static int aspeed_adc_probe(struct platform_device *pdev)
        }
 
        /* Start all channels in normal mode. */
-       clk_prepare_enable(data->clk_scaler->clk);
+       ret = clk_prepare_enable(data->clk_scaler->clk);
+       if (ret)
+               goto clk_enable_error;
+
        adc_engine_control_reg_val = GENMASK(31, 16) |
                ASPEED_OPERATION_MODE_NORMAL | ASPEED_ENGINE_ENABLE;
        writel(adc_engine_control_reg_val,
@@ -261,6 +264,7 @@ iio_register_error:
        writel(ASPEED_OPERATION_MODE_POWER_DOWN,
                data->base + ASPEED_REG_ENGINE_CONTROL);
        clk_disable_unprepare(data->clk_scaler->clk);
+clk_enable_error:
        clk_hw_unregister_divider(data->clk_scaler);
 
 scaler_error: