From: Vignesh Raghavendra <vigneshr@ti.com> To: Tudor Ambarus <tudor.ambarus@microchip.com>, Mark Brown <broonie@kernel.org> Cc: Vignesh Raghavendra <vigneshr@ti.com>, Boris Brezillon <bbrezillon@kernel.org>, Ramuthevar Vadivel Murugan <vadivel.muruganx.ramuthevar@linux.intel.com>, <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>, <linux-spi@vger.kernel.org>, <simon.k.r.goldschmidt@gmail.com>, <dinguyen@kernel.org>, <marex@denx.de> Subject: [RESEND PATCH v3 4/8] mtd: spi-nor: cadence-quadspi: Fix error path on failure to acquire reset lines Date: Mon, 1 Jun 2020 12:34:40 +0530 [thread overview] Message-ID: <20200601070444.16923-5-vigneshr@ti.com> (raw) In-Reply-To: <20200601070444.16923-1-vigneshr@ti.com> Make sure to undo the prior changes done by the driver when exiting due to failure to acquire reset lines. Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> --- drivers/mtd/spi-nor/controllers/cadence-quadspi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi-nor/controllers/cadence-quadspi.c b/drivers/mtd/spi-nor/controllers/cadence-quadspi.c index 379e22c11c87f..608ca657ff7f5 100644 --- a/drivers/mtd/spi-nor/controllers/cadence-quadspi.c +++ b/drivers/mtd/spi-nor/controllers/cadence-quadspi.c @@ -1359,13 +1359,13 @@ static int cqspi_probe(struct platform_device *pdev) rstc = devm_reset_control_get_optional_exclusive(dev, "qspi"); if (IS_ERR(rstc)) { dev_err(dev, "Cannot get QSPI reset.\n"); - return PTR_ERR(rstc); + goto probe_reset_failed; } rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp"); if (IS_ERR(rstc_ocp)) { dev_err(dev, "Cannot get QSPI OCP reset.\n"); - return PTR_ERR(rstc_ocp); + goto probe_reset_failed; } reset_control_assert(rstc); @@ -1384,7 +1384,7 @@ static int cqspi_probe(struct platform_device *pdev) pdev->name, cqspi); if (ret) { dev_err(dev, "Cannot request IRQ.\n"); - goto probe_irq_failed; + goto probe_reset_failed; } cqspi_wait_idle(cqspi); @@ -1401,7 +1401,7 @@ static int cqspi_probe(struct platform_device *pdev) return ret; probe_setup_failed: cqspi_controller_enable(cqspi, 0); -probe_irq_failed: +probe_reset_failed: clk_disable_unprepare(cqspi->clk); probe_clk_failed: pm_runtime_put_sync(dev); -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Vignesh Raghavendra <vigneshr@ti.com> To: Tudor Ambarus <tudor.ambarus@microchip.com>, Mark Brown <broonie@kernel.org> Cc: marex@denx.de, Vignesh Raghavendra <vigneshr@ti.com>, Boris Brezillon <bbrezillon@kernel.org>, dinguyen@kernel.org, simon.k.r.goldschmidt@gmail.com, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Ramuthevar Vadivel Murugan <vadivel.muruganx.ramuthevar@linux.intel.com>, linux-mtd@lists.infradead.org Subject: [RESEND PATCH v3 4/8] mtd: spi-nor: cadence-quadspi: Fix error path on failure to acquire reset lines Date: Mon, 1 Jun 2020 12:34:40 +0530 [thread overview] Message-ID: <20200601070444.16923-5-vigneshr@ti.com> (raw) In-Reply-To: <20200601070444.16923-1-vigneshr@ti.com> Make sure to undo the prior changes done by the driver when exiting due to failure to acquire reset lines. Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> --- drivers/mtd/spi-nor/controllers/cadence-quadspi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi-nor/controllers/cadence-quadspi.c b/drivers/mtd/spi-nor/controllers/cadence-quadspi.c index 379e22c11c87f..608ca657ff7f5 100644 --- a/drivers/mtd/spi-nor/controllers/cadence-quadspi.c +++ b/drivers/mtd/spi-nor/controllers/cadence-quadspi.c @@ -1359,13 +1359,13 @@ static int cqspi_probe(struct platform_device *pdev) rstc = devm_reset_control_get_optional_exclusive(dev, "qspi"); if (IS_ERR(rstc)) { dev_err(dev, "Cannot get QSPI reset.\n"); - return PTR_ERR(rstc); + goto probe_reset_failed; } rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp"); if (IS_ERR(rstc_ocp)) { dev_err(dev, "Cannot get QSPI OCP reset.\n"); - return PTR_ERR(rstc_ocp); + goto probe_reset_failed; } reset_control_assert(rstc); @@ -1384,7 +1384,7 @@ static int cqspi_probe(struct platform_device *pdev) pdev->name, cqspi); if (ret) { dev_err(dev, "Cannot request IRQ.\n"); - goto probe_irq_failed; + goto probe_reset_failed; } cqspi_wait_idle(cqspi); @@ -1401,7 +1401,7 @@ static int cqspi_probe(struct platform_device *pdev) return ret; probe_setup_failed: cqspi_controller_enable(cqspi, 0); -probe_irq_failed: +probe_reset_failed: clk_disable_unprepare(cqspi->clk); probe_clk_failed: pm_runtime_put_sync(dev); -- 2.26.2 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-06-01 7:05 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-01 7:04 [RESEND PATCH v3 0/8] mtd: spi-nor: Move cadence-qaudspi to spi-mem framework Vignesh Raghavendra 2020-06-01 7:04 ` Vignesh Raghavendra 2020-06-01 7:04 ` [RESEND PATCH v3 1/8] mtd: spi-nor: cadence-quadspi: Make driver independent of flash geometry Vignesh Raghavendra 2020-06-01 7:04 ` Vignesh Raghavendra 2020-06-01 7:04 ` [RESEND PATCH v3 2/8] mtd: spi-nor: cadence-quadspi: Provide a way to disable DAC mode Vignesh Raghavendra 2020-06-01 7:04 ` Vignesh Raghavendra 2020-06-01 7:04 ` [RESEND PATCH v3 3/8] mtd: spi-nor: cadence-quadspi: Don't initialize rx_dma_complete on failure Vignesh Raghavendra 2020-06-01 7:04 ` Vignesh Raghavendra 2020-06-01 7:04 ` Vignesh Raghavendra [this message] 2020-06-01 7:04 ` [RESEND PATCH v3 4/8] mtd: spi-nor: cadence-quadspi: Fix error path on failure to acquire reset lines Vignesh Raghavendra 2020-06-01 7:04 ` [RESEND PATCH v3 5/8] mtd: spi-nor: cadence-quadspi: Handle probe deferral while requesting DMA channel Vignesh Raghavendra 2020-06-01 7:04 ` Vignesh Raghavendra 2020-08-22 18:05 ` Jan Kiszka 2020-08-22 18:05 ` Jan Kiszka 2020-08-24 11:45 ` Vignesh Raghavendra 2020-08-24 11:45 ` Vignesh Raghavendra 2020-08-24 12:49 ` Jan Kiszka 2020-08-24 12:49 ` Jan Kiszka 2020-08-24 17:20 ` Jan Kiszka 2020-08-24 17:20 ` Jan Kiszka 2020-08-26 10:12 ` Jan Kiszka 2020-08-26 10:12 ` Jan Kiszka 2020-08-26 12:18 ` Vignesh Raghavendra 2020-08-26 12:18 ` Vignesh Raghavendra 2020-08-26 13:31 ` Jan Kiszka 2020-08-26 13:31 ` Jan Kiszka 2020-08-27 7:04 ` Vignesh Raghavendra 2020-08-27 7:04 ` Vignesh Raghavendra 2020-08-25 3:12 ` Jin, Le 2020-08-25 3:12 ` Jin, Le 2020-06-01 7:04 ` [RESEND PATCH v3 6/8] mtd: spi-nor: cadence-quadspi: Drop redundant WREN in erase path Vignesh Raghavendra 2020-06-01 7:04 ` Vignesh Raghavendra 2020-06-01 7:04 ` [RESEND PATCH v3 7/8] mtd: spi-nor: Convert cadence-quadspi to use spi-mem framework Vignesh Raghavendra 2020-06-01 7:04 ` Vignesh Raghavendra 2020-08-24 5:55 ` Jan Kiszka 2020-08-24 5:55 ` Jan Kiszka 2020-08-24 11:44 ` Vignesh Raghavendra 2020-08-24 11:44 ` Vignesh Raghavendra 2020-08-24 12:04 ` Boris Brezillon 2020-08-24 12:04 ` Boris Brezillon 2020-08-24 13:52 ` Jan Kiszka 2020-08-24 13:52 ` Jan Kiszka 2020-08-24 12:06 ` Jan Kiszka 2020-08-24 12:06 ` Jan Kiszka 2020-06-01 7:04 ` [RESEND PATCH v3 8/8] spi: Move cadence-quadspi driver to drivers/spi/ Vignesh Raghavendra 2020-06-01 7:04 ` Vignesh Raghavendra 2020-06-19 10:57 ` [RESEND PATCH v3 0/8] mtd: spi-nor: Move cadence-qaudspi to spi-mem framework Mark Brown 2020-06-19 10:57 ` Mark Brown 2020-06-19 11:47 ` Tudor.Ambarus 2020-06-19 11:47 ` Tudor.Ambarus 2020-06-19 15:17 ` Mark Brown 2020-06-19 15:17 ` Mark Brown 2020-06-26 9:25 ` Tudor.Ambarus 2020-06-26 9:25 ` Tudor.Ambarus 2020-06-19 13:28 ` Mark Brown 2020-06-19 13:28 ` Mark Brown
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=20200601070444.16923-5-vigneshr@ti.com \ --to=vigneshr@ti.com \ --cc=bbrezillon@kernel.org \ --cc=broonie@kernel.org \ --cc=dinguyen@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-spi@vger.kernel.org \ --cc=marex@denx.de \ --cc=simon.k.r.goldschmidt@gmail.com \ --cc=tudor.ambarus@microchip.com \ --cc=vadivel.muruganx.ramuthevar@linux.intel.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.