* [PATCH] dmaengine: axi-dmac: add a check for devm_regmap_init_mmio
@ 2019-12-09 8:57 Chuhong Yuan
2019-12-09 9:28 ` Ardelean, Alexandru
2019-12-11 10:42 ` Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Chuhong Yuan @ 2019-12-09 8:57 UTC (permalink / raw)
Cc: Lars-Peter Clausen, Dan Williams, Vinod Koul, Alexandru Ardelean,
dmaengine, linux-kernel, Chuhong Yuan
The driver misses checking the result of devm_regmap_init_mmio().
Add a check to fix it.
Fixes: fc15be39a827 ("dmaengine: axi-dmac: add regmap support")
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
drivers/dma/dma-axi-dmac.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c
index a0ee404b736e..cf4f892562cc 100644
--- a/drivers/dma/dma-axi-dmac.c
+++ b/drivers/dma/dma-axi-dmac.c
@@ -830,6 +830,7 @@ static int axi_dmac_probe(struct platform_device *pdev)
struct dma_device *dma_dev;
struct axi_dmac *dmac;
struct resource *res;
+ struct regmap *regmap;
int ret;
dmac = devm_kzalloc(&pdev->dev, sizeof(*dmac), GFP_KERNEL);
@@ -921,10 +922,17 @@ static int axi_dmac_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, dmac);
- devm_regmap_init_mmio(&pdev->dev, dmac->base, &axi_dmac_regmap_config);
+ regmap = devm_regmap_init_mmio(&pdev->dev, dmac->base,
+ &axi_dmac_regmap_config);
+ if (IS_ERR(regmap)) {
+ ret = PTR_ERR(regmap);
+ goto err_free_irq;
+ }
return 0;
+err_free_irq:
+ free_irq(dmac->irq, dmac);
err_unregister_of:
of_dma_controller_free(pdev->dev.of_node);
err_unregister_device:
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] dmaengine: axi-dmac: add a check for devm_regmap_init_mmio
2019-12-09 8:57 [PATCH] dmaengine: axi-dmac: add a check for devm_regmap_init_mmio Chuhong Yuan
@ 2019-12-09 9:28 ` Ardelean, Alexandru
2019-12-11 10:42 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Ardelean, Alexandru @ 2019-12-09 9:28 UTC (permalink / raw)
To: hslester96@gmail.com
Cc: dan.j.williams@intel.com, vkoul@kernel.org,
dmaengine@vger.kernel.org, lars@metafoo.de,
linux-kernel@vger.kernel.org
On Mon, 2019-12-09 at 16:57 +0800, Chuhong Yuan wrote:
> [External]
>
> The driver misses checking the result of devm_regmap_init_mmio().
> Add a check to fix it.
Thanks :)
Reviewed-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
>
> Fixes: fc15be39a827 ("dmaengine: axi-dmac: add regmap support")
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
> ---
> drivers/dma/dma-axi-dmac.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c
> index a0ee404b736e..cf4f892562cc 100644
> --- a/drivers/dma/dma-axi-dmac.c
> +++ b/drivers/dma/dma-axi-dmac.c
> @@ -830,6 +830,7 @@ static int axi_dmac_probe(struct platform_device
> *pdev)
> struct dma_device *dma_dev;
> struct axi_dmac *dmac;
> struct resource *res;
> + struct regmap *regmap;
> int ret;
>
> dmac = devm_kzalloc(&pdev->dev, sizeof(*dmac), GFP_KERNEL);
> @@ -921,10 +922,17 @@ static int axi_dmac_probe(struct platform_device
> *pdev)
>
> platform_set_drvdata(pdev, dmac);
>
> - devm_regmap_init_mmio(&pdev->dev, dmac->base,
> &axi_dmac_regmap_config);
> + regmap = devm_regmap_init_mmio(&pdev->dev, dmac->base,
> + &axi_dmac_regmap_config);
> + if (IS_ERR(regmap)) {
> + ret = PTR_ERR(regmap);
> + goto err_free_irq;
> + }
>
> return 0;
>
> +err_free_irq:
> + free_irq(dmac->irq, dmac);
> err_unregister_of:
> of_dma_controller_free(pdev->dev.of_node);
> err_unregister_device:
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] dmaengine: axi-dmac: add a check for devm_regmap_init_mmio
2019-12-09 8:57 [PATCH] dmaengine: axi-dmac: add a check for devm_regmap_init_mmio Chuhong Yuan
2019-12-09 9:28 ` Ardelean, Alexandru
@ 2019-12-11 10:42 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2019-12-11 10:42 UTC (permalink / raw)
To: Chuhong Yuan
Cc: Lars-Peter Clausen, Dan Williams, Alexandru Ardelean, dmaengine,
linux-kernel
On 09-12-19, 16:57, Chuhong Yuan wrote:
> The driver misses checking the result of devm_regmap_init_mmio().
> Add a check to fix it.
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-11 10:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-09 8:57 [PATCH] dmaengine: axi-dmac: add a check for devm_regmap_init_mmio Chuhong Yuan
2019-12-09 9:28 ` Ardelean, Alexandru
2019-12-11 10:42 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox