* [PATCH] mtd: nand: gpmi: Release DMA channels on failure
@ 2017-12-28 18:07 Fabio Estevam
2018-01-10 21:50 ` Han Xu
0 siblings, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2017-12-28 18:07 UTC (permalink / raw)
To: boris.brezillon; +Cc: han.xu, linux-mtd, Fabio Estevam
From: Fabio Estevam <fabio.estevam@nxp.com>
release_dma_channels() should be called in the case of error in
gpmi_init() or bch_set_geometry(), because acquire_dma_channels() has
been called previously.
Handle the error cases correctly.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 2ef8979..acfa5f5 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -2137,20 +2137,25 @@ static int gpmi_pm_resume(struct device *dev)
ret = gpmi_init(this);
if (ret) {
dev_err(this->dev, "Error setting GPMI : %d\n", ret);
- return ret;
+ goto release_dma_channels;
}
/* re-init the BCH registers */
ret = bch_set_geometry(this);
if (ret) {
dev_err(this->dev, "Error setting BCH : %d\n", ret);
- return ret;
+ goto release_dma_channels;
}
/* re-init others */
gpmi_extra_init(this);
return 0;
+
+release_dma_channels:
+ release_dma_channels(this);
+ return ret;
+
}
#endif /* CONFIG_PM_SLEEP */
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mtd: nand: gpmi: Release DMA channels on failure
2017-12-28 18:07 [PATCH] mtd: nand: gpmi: Release DMA channels on failure Fabio Estevam
@ 2018-01-10 21:50 ` Han Xu
2018-01-10 22:04 ` Boris Brezillon
0 siblings, 1 reply; 4+ messages in thread
From: Han Xu @ 2018-01-10 21:50 UTC (permalink / raw)
To: Fabio Estevam, boris.brezillon@free-electrons.com
Cc: linux-mtd@lists.infradead.org, Fabio Estevam
________________________________________
From: Fabio Estevam <festevam@gmail.com>
Sent: Thursday, December 28, 2017 12:07 PM
To: boris.brezillon@free-electrons.com
Cc: Han Xu; linux-mtd@lists.infradead.org; Fabio Estevam
Subject: [PATCH] mtd: nand: gpmi: Release DMA channels on failure
From: Fabio Estevam <fabio.estevam@nxp.com>
release_dma_channels() should be called in the case of error in
gpmi_init() or bch_set_geometry(), because acquire_dma_channels() has
been called previously.
Handle the error cases correctly.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 2ef8979..acfa5f5 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -2137,20 +2137,25 @@ static int gpmi_pm_resume(struct device *dev)
ret = gpmi_init(this);
if (ret) {
dev_err(this->dev, "Error setting GPMI : %d\n", ret);
- return ret;
+ goto release_dma_channels;
}
/* re-init the BCH registers */
ret = bch_set_geometry(this);
if (ret) {
dev_err(this->dev, "Error setting BCH : %d\n", ret);
- return ret;
+ goto release_dma_channels;
}
/* re-init others */
gpmi_extra_init(this);
return 0;
+
+release_dma_channels:
+ release_dma_channels(this);
+ return ret;
+
}
#endif /* CONFIG_PM_SLEEP */
Acked-by: Han Xu <han.xu@nxp.com>
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mtd: nand: gpmi: Release DMA channels on failure
2018-01-10 21:50 ` Han Xu
@ 2018-01-10 22:04 ` Boris Brezillon
2018-01-10 22:30 ` Han Xu
0 siblings, 1 reply; 4+ messages in thread
From: Boris Brezillon @ 2018-01-10 22:04 UTC (permalink / raw)
To: Han Xu; +Cc: Fabio Estevam, Fabio Estevam, linux-mtd@lists.infradead.org
Hi Han,
On Wed, 10 Jan 2018 21:50:41 +0000
Han Xu <han.xu@nxp.com> wrote:
> ________________________________________
> From: Fabio Estevam <festevam@gmail.com>
> Sent: Thursday, December 28, 2017 12:07 PM
> To: boris.brezillon@free-electrons.com
> Cc: Han Xu; linux-mtd@lists.infradead.org; Fabio Estevam
> Subject: [PATCH] mtd: nand: gpmi: Release DMA channels on failure
>
> From: Fabio Estevam <fabio.estevam@nxp.com>
>
> release_dma_channels() should be called in the case of error in
> gpmi_init() or bch_set_geometry(), because acquire_dma_channels() has
> been called previously.
>
> Handle the error cases correctly.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
> drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 2ef8979..acfa5f5 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -2137,20 +2137,25 @@ static int gpmi_pm_resume(struct device *dev)
> ret = gpmi_init(this);
> if (ret) {
> dev_err(this->dev, "Error setting GPMI : %d\n", ret);
> - return ret;
> + goto release_dma_channels;
> }
>
> /* re-init the BCH registers */
> ret = bch_set_geometry(this);
> if (ret) {
> dev_err(this->dev, "Error setting BCH : %d\n", ret);
> - return ret;
> + goto release_dma_channels;
> }
>
> /* re-init others */
> gpmi_extra_init(this);
>
> return 0;
> +
> +release_dma_channels:
> + release_dma_channels(this);
> + return ret;
> +
> }
> #endif /* CONFIG_PM_SLEEP */
>
> Acked-by: Han Xu <han.xu@nxp.com>
Did you read my comment on v2 of this patch?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mtd: nand: gpmi: Release DMA channels on failure
2018-01-10 22:04 ` Boris Brezillon
@ 2018-01-10 22:30 ` Han Xu
0 siblings, 0 replies; 4+ messages in thread
From: Han Xu @ 2018-01-10 22:30 UTC (permalink / raw)
To: Boris Brezillon
Cc: Fabio Estevam, Fabio Estevam, linux-mtd@lists.infradead.org
________________________________________
From: Boris Brezillon <boris.brezillon@free-electrons.com>
Sent: Wednesday, January 10, 2018 4:04 PM
To: Han Xu
Cc: Fabio Estevam; Fabio Estevam; linux-mtd@lists.infradead.org
Subject: Re: [PATCH] mtd: nand: gpmi: Release DMA channels on failure
Hi Han,
On Wed, 10 Jan 2018 21:50:41 +0000
Han Xu <han.xu@nxp.com> wrote:
> ________________________________________
> From: Fabio Estevam <festevam@gmail.com>
> Sent: Thursday, December 28, 2017 12:07 PM
> To: boris.brezillon@free-electrons.com
> Cc: Han Xu; linux-mtd@lists.infradead.org; Fabio Estevam
> Subject: [PATCH] mtd: nand: gpmi: Release DMA channels on failure
>
> From: Fabio Estevam <fabio.estevam@nxp.com>
>
> release_dma_channels() should be called in the case of error in
> gpmi_init() or bch_set_geometry(), because acquire_dma_channels() has
> been called previously.
>
> Handle the error cases correctly.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
> drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 2ef8979..acfa5f5 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -2137,20 +2137,25 @@ static int gpmi_pm_resume(struct device *dev)
> ret = gpmi_init(this);
> if (ret) {
> dev_err(this->dev, "Error setting GPMI : %d\n", ret);
> - return ret;
> + goto release_dma_channels;
> }
>
> /* re-init the BCH registers */
> ret = bch_set_geometry(this);
> if (ret) {
> dev_err(this->dev, "Error setting BCH : %d\n", ret);
> - return ret;
> + goto release_dma_channels;
> }
>
> /* re-init others */
> gpmi_extra_init(this);
>
> return 0;
> +
> +release_dma_channels:
> + release_dma_channels(this);
> + return ret;
> +
> }
> #endif /* CONFIG_PM_SLEEP */
>
> Acked-by: Han Xu <han.xu@nxp.com>
Did you read my comment on v2 of this patch?
Sorry I missed the emails, I agree with you not to release the DMA even returning error.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-01-10 22:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-28 18:07 [PATCH] mtd: nand: gpmi: Release DMA channels on failure Fabio Estevam
2018-01-10 21:50 ` Han Xu
2018-01-10 22:04 ` Boris Brezillon
2018-01-10 22:30 ` Han Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox