[GIT PULL for-3.18 05/13] iio: adc: xilinx: Fix error handling

[Levin, Alexander (Sasha Levin)]

From: Christophe JAILLET <christophe.jail...@wanadoo.fr>

[ Upstream commit ca1c39ef76376b67303d01f94fe98bb68bb3861a ]

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

Signed-off-by: Christophe JAILLET <christophe.jail...@wanadoo.fr>
Acked-by: Lars-Peter Clausen <l...@metafoo.de>
Signed-off-by: Jonathan Cameron <ji...@kernel.org>
Signed-off-by: Sasha Levin <alexander.le...@verizon.com>
---
 drivers/iio/adc/xilinx-xadc-core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/adc/xilinx-xadc-core.c 
b/drivers/iio/adc/xilinx-xadc-core.c
index ce93bd8e3f68..a483747cdc9b 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -1223,7 +1223,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_threaded_irq(irq, xadc->ops->interrupt_handler,
                                xadc->ops->threaded_interrupt_handler,
@@ -1284,6 +1284,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);
@@ -1293,8 +1295,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);
 
-- 
2.11.0