Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: "Levin, Alexander (Sasha Levin)" Newsgroups: linux.kernel Subject: [PATCH review for 4.9 13/50] iio: adc: xilinx: Fix error handling Date: Mon, 25 Sep 2017 03:40:01 +0200 Message-ID: References: X-Original-To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506302055; x=1537838055; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=3qwy6iZh5lYJVSOjqqxQyUxwMty4xAOnf/looU1BwtU=; b=EqukUpf39Xy1SYml5GX95Os+UQV7AHrATqQ3mTapl5sOSCHP5tsrRJ6y i0KuUjg9t5bwgOygOvIZIgLHZVsFDs4nYdDNb7uaZzmLG8ImkYSe85rLB hNUTT584qMGmf5F4jBwPjEOWaK2I6k0lfHl1RZRIoGjUFEtOiDVBpAO4V Y=; Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506301971; x=1537837971; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=3qwy6iZh5lYJVSOjqqxQyUxwMty4xAOnf/looU1BwtU=; b=GJyWNTXeTUwq2zAUKBTwaMISgYjfbAr8OkIemOjm3jFVHAGtkMl4/Xpq l7PbY7MRqVby6/QUveELylUX/uE42tmZv1dii4GNDFSd/siRvC7i/X1rQ zUhJjVm362K9nYTeZnBzSAhIIojMFT8JYa5BJDlPSEhF59ZgmvJXtidhG c=; Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506301971; x=1537837971; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=3qwy6iZh5lYJVSOjqqxQyUxwMty4xAOnf/looU1BwtU=; b=GJyWNTXeTUwq2zAUKBTwaMISgYjfbAr8OkIemOjm3jFVHAGtkMl4/Xpq l7PbY7MRqVby6/QUveELylUX/uE42tmZv1dii4GNDFSd/siRvC7i/X1rQ zUhJjVm362K9nYTeZnBzSAhIIojMFT8JYa5BJDlPSEhF59ZgmvJXtidhG c=; X-Host: discovery.odc.vzwcorp.com Thread-Topic: [PATCH review for 4.9 13/50] iio: adc: xilinx: Fix error handling Thread-Index: AQHTNZtkniLFW1LNDEeR/gAkKYa6BQ== Accept-Language: en-US Content-Language: en-US X-Ms-Exchange-Messagesentrepresentingtype: 1 X-Ms-Exchange-Transport-Fromentityheader: Hosted X-Originating-IP: [10.144.60.250] Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 49 Organization: linux.* mail to news gateway X-Original-Cc: Christophe JAILLET , Jonathan Cameron , "Levin, Alexander (Sasha Levin)" X-Original-Date: Mon, 25 Sep 2017 01:12:44 +0000 X-Original-Message-ID: <20170925011225.10029-13-alexander.levin@verizon.com> X-Original-References: <20170925011225.10029-1-alexander.levin@verizon.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1738685 From: Christophe JAILLET [ Upstream commit ca1c39ef76376b67303d01f94fe98bb68bb3861a ] Reorder error handling labels in order to match the way resources have been allocated. Signed-off-by: Christophe JAILLET Acked-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- 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-xa= dc-core.c index 0a6beb3d99cb..56cf5907a5f0 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) =20 ret =3D xadc->ops->setup(pdev, indio_dev, irq); if (ret) - goto err_free_samplerate_trigger; + goto err_clk_disable_unprepare; =20 ret =3D 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) =20 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); =20 --=20 2.11.0