Skip to content

Commit ca1c39e

Browse files
tititiou36jic23
authored andcommitted
iio: adc: xilinx: Fix error handling
Reorder error handling labels in order to match the way resources have been allocated. Signed-off-by: Christophe JAILLET <[email protected]> Acked-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
1 parent ca8d8e0 commit ca1c39e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@ static int xadc_probe(struct platform_device *pdev)
12081208

12091209
ret = xadc->ops->setup(pdev, indio_dev, irq);
12101210
if (ret)
1211-
goto err_free_samplerate_trigger;
1211+
goto err_clk_disable_unprepare;
12121212

12131213
ret = request_irq(irq, xadc->ops->interrupt_handler, 0,
12141214
dev_name(&pdev->dev), indio_dev);
@@ -1268,6 +1268,8 @@ static int xadc_probe(struct platform_device *pdev)
12681268

12691269
err_free_irq:
12701270
free_irq(irq, indio_dev);
1271+
err_clk_disable_unprepare:
1272+
clk_disable_unprepare(xadc->clk);
12711273
err_free_samplerate_trigger:
12721274
if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
12731275
iio_trigger_free(xadc->samplerate_trigger);
@@ -1277,8 +1279,6 @@ static int xadc_probe(struct platform_device *pdev)
12771279
err_triggered_buffer_cleanup:
12781280
if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
12791281
iio_triggered_buffer_cleanup(indio_dev);
1280-
err_clk_disable_unprepare:
1281-
clk_disable_unprepare(xadc->clk);
12821282
err_device_free:
12831283
kfree(indio_dev->channels);
12841284

0 commit comments

Comments
 (0)