From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752555AbdBUL4L (ORCPT ); Tue, 21 Feb 2017 06:56:11 -0500 Received: from www381.your-server.de ([78.46.137.84]:46997 "EHLO www381.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752114AbdBULz6 (ORCPT ); Tue, 21 Feb 2017 06:55:58 -0500 Subject: Re: [PATCH v2] iio: adc: xilinx: Fix error handling To: Christophe JAILLET , jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, michal.simek@xilinx.com, soren.brinkmann@xilinx.com References: <20170221063400.2984-1-christophe.jaillet@wanadoo.fr> Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org From: Lars-Peter Clausen Message-ID: <2c05b3bd-b5b4-e322-5d92-cd1c65d84ff5@metafoo.de> Date: Tue, 21 Feb 2017 12:55:39 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.6.0 MIME-Version: 1.0 In-Reply-To: <20170221063400.2984-1-christophe.jaillet@wanadoo.fr> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Authenticated-Sender: lars@metafoo.de Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/21/2017 07:34 AM, Christophe JAILLET wrote: > Reorder error handling labels in order to match the way resources have > been allocated. > > Signed-off-by: Christophe JAILLET Thanks. Acked-by: Lars-Peter Clausen > --- > v2: update goto label if 'xadc->ops->setup()' fails > --- > drivers/iio/adc/xilinx-xadc-core.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c > index 0a6beb3d99cb..515b91963db5 100644 > --- a/drivers/iio/adc/xilinx-xadc-core.c > +++ b/drivers/iio/adc/xilinx-xadc-core.c > @@ -1206,11 +1206,11 @@ static int xadc_probe(struct platform_device *pdev) > } > clk_prepare_enable(xadc->clk); > > 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); > if (ret) > goto err_clk_disable_unprepare; > @@ -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 @@ static int xadc_probe(struct platform_device *pdev) > 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); > >