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

Commit 4d134d83 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

iio: adc: xilinx: Fix error handling 




[ Upstream commit ca1c39ef76376b67303d01f94fe98bb68bb3861a ]

Reorder error handling labels in order to match the way resources have
been allocated.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c65ed5c

drivers/iio/adc/xilinx-xadc-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1208,7 +1208,7 @@ static int xadc_probe(struct platform_device *pdev) 


	ret = xadc->ops->setup(pdev, indio_dev, irq);

	if (ret)

		goto err_free_samplerate_trigger;

		goto err_clk_disable_unprepare;



	ret = request_irq(irq, xadc->ops->interrupt_handler, 0,

			dev_name(&pdev->dev), indio_dev);
@@ -1268,6 +1268,8 @@ static int xadc_probe(struct platform_device *pdev) 


err_free_irq:

	free_irq(irq, indio_dev);

err_clk_disable_unprepare:

	clk_disable_unprepare(xadc->clk);

err_free_samplerate_trigger:

	if (xadc->ops->flags & XADC_FLAGS_BUFFERED)

		iio_trigger_free(xadc->samplerate_trigger);
@@ -1277,8 +1279,6 @@ err_free_convst_trigger: 
err_triggered_buffer_cleanup:

	if (xadc->ops->flags & XADC_FLAGS_BUFFERED)

		iio_triggered_buffer_cleanup(indio_dev);

err_clk_disable_unprepare:

	clk_disable_unprepare(xadc->clk);

err_device_free:

	kfree(indio_dev->channels);