lkml.org 
[lkml]   [2017]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH review for 4.4 08/26] iio: adc: xilinx: Fix error handling
    Date
    From: Christophe JAILLET <christophe.jaillet@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.jaillet@wanadoo.fr>
    Acked-by: Lars-Peter Clausen <lars@metafoo.de>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@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 02e636a1c49a..475c5a74f2d1 100644
    --- a/drivers/iio/adc/xilinx-xadc-core.c
    +++ b/drivers/iio/adc/xilinx-xadc-core.c
    @@ -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);

    --
    2.11.0
    \
     
     \ /
      Last update: 2017-09-25 03:21    [W:8.941 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site