Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 787e1853 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jonathan Cameron
Browse files

iio: adc: aspeed: Fix error handling path 



The labels and branching order of the error path of 'aspeed_adc_probe()'
are broken.
Re-order the labels and goto statements.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent a66a4e8e

drivers/iio/adc/aspeed_adc.c

+4 −3
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) 
					 ASPEED_ADC_INIT_POLLING_TIME,

					 ASPEED_ADC_INIT_TIMEOUT);

		if (ret)

			goto scaler_error;

			goto poll_timeout_error;

	}



	/* Start all channels in normal mode. */
@@ -274,9 +274,10 @@ 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);

reset_error:

	reset_control_assert(data->rst);

clk_enable_error:

poll_timeout_error:

	reset_control_assert(data->rst);

reset_error:

	clk_hw_unregister_divider(data->clk_scaler);

scaler_error:

	clk_hw_unregister_divider(data->clk_prescaler);