Skip to content

Commit

Permalink
iio: Aspeed ADC - Handle return value of clk_prepare_enable
Browse files Browse the repository at this point in the history
clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Reviewed-by: Rick Altherr <raltherr@google.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  • Loading branch information
Arvind Yadav authored and Jonathan Cameron committed Jun 11, 2017
1 parent 440d303 commit 4e36a8a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/iio/adc/aspeed_adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,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,
Expand All @@ -236,6 +239,7 @@ static int aspeed_adc_probe(struct platform_device *pdev)
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:
Expand Down

0 comments on commit 4e36a8a

Please sign in to comment.