From: Vignesh R <vigneshr@ti.com>
To: Marek Vasut <marek.vasut@gmail.com>,
Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
Cc: David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Boris Brezillon <boris.brezillon@free-electrons.com>,
Rob Herring <robh+dt@kernel.org>,
linux-mtd@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, Vignesh R <vigneshr@ti.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
Subject: [PATCH v4 5/6] mtd: spi-nor: cadence-quadspi: Fix error path in probe
Date: Tue, 3 Oct 2017 10:49:24 +0530 [thread overview]
Message-ID: <20171003051925.8821-6-vigneshr@ti.com> (raw)
In-Reply-To: <20171003051925.8821-1-vigneshr@ti.com>
Fix the reversed goto labels, so that we disable cqspi controller only
if its enabled previously. This is a minor cleanup.
Signed-off-by: Vignesh R <vigneshr@ti.com>
---
drivers/mtd/spi-nor/cadence-quadspi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
index d9629e8f4798..60b557e00cfb 100644
--- a/drivers/mtd/spi-nor/cadence-quadspi.c
+++ b/drivers/mtd/spi-nor/cadence-quadspi.c
@@ -1255,9 +1255,9 @@ static int cqspi_probe(struct platform_device *pdev)
}
return ret;
-probe_irq_failed:
- cqspi_controller_enable(cqspi, 0);
probe_setup_failed:
+ cqspi_controller_enable(cqspi, 0);
+probe_irq_failed:
clk_disable_unprepare(cqspi->clk);
return ret;
}
--
2.14.1
prev parent reply other threads:[~2017-10-03 5:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-03 5:19 [PATCH v4 0/6] K2G: Add QSPI support Vignesh R
2017-10-03 5:19 ` [PATCH v4 1/6] mtd: spi-nor: cadence-quadspi: Add TI 66AK2G SoC specific compatible Vignesh R
2017-10-03 5:19 ` [PATCH v4 2/6] mtd: spi-nor: cadence-quadspi: add a delay in write sequence Vignesh R
[not found] ` <20171003051925.8821-1-vigneshr-l0cyMroinI0@public.gmane.org>
2017-10-03 5:19 ` [PATCH v4 3/6] mtd: spi-nor: cadence-quadspi: Add new binding to enable loop-back circuit Vignesh R
2017-10-03 5:19 ` [PATCH v4 4/6] mtd: spi-nor: cadence-quadspi: Add support to enable loop-back clock circuit Vignesh R
2017-10-03 5:19 ` [PATCH v4 6/6] mtd: spi-nor: cadence-quadspi: Add runtime PM support Vignesh R
2017-10-16 6:15 ` [PATCH v4 0/6] K2G: Add QSPI support Vignesh R
[not found] ` <09cc0a61-3f73-4a10-2d67-32515a7da861-l0cyMroinI0@public.gmane.org>
2017-10-16 9:28 ` Marek Vasut
[not found] ` <6f507813-388a-13e5-31ba-736b419744fa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-10-16 22:29 ` Cyrille Pitchen
2017-10-16 22:34 ` Marek Vasut
[not found] ` <ebd85d99-431b-3f6d-4bdf-e7d47b81567c-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-10-17 18:50 ` Cyrille Pitchen
2017-10-03 5:19 ` Vignesh R [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171003051925.8821-6-vigneshr@ti.com \
--to=vigneshr@ti.com \
--cc=boris.brezillon@free-electrons.com \
--cc=computersforpeace@gmail.com \
--cc=cyrille.pitchen@wedev4u.fr \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).