diff mbox series

[1/2] mmc: cavium-octeon: Add of_node_put() when breaking out of loop

Message ID 20220719095216.1241601-1-windhl@126.com
State New
Headers show
Series [1/2] mmc: cavium-octeon: Add of_node_put() when breaking out of loop | expand

Commit Message

Liang He July 19, 2022, 9:52 a.m. UTC
In octeon_mmc_probe(), we should call of_node_put() when breaking
out of for_each_child_of_node() which has increased and decreased
the refcount during each iteration.

Fixes: 01d95843335c ("mmc: cavium: Add MMC support for Octeon SOCs.")
Signed-off-by: Liang He <windhl@126.com>
---
 drivers/mmc/host/cavium-octeon.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Robert Richter July 20, 2022, 11:35 a.m. UTC | #1
On 19.07.22 17:52:15, Liang He wrote:
> In octeon_mmc_probe(), we should call of_node_put() when breaking
> out of for_each_child_of_node() which has increased and decreased
> the refcount during each iteration.
> 
> Fixes: 01d95843335c ("mmc: cavium: Add MMC support for Octeon SOCs.")
> Signed-off-by: Liang He <windhl@126.com>

Acked-by: Robert Richter <rric@kernel.org>

> ---
>  drivers/mmc/host/cavium-octeon.c | 1 +
>  1 file changed, 1 insertion(+)
Robert Richter July 20, 2022, 11:35 a.m. UTC | #2
On 19.07.22 17:52:16, Liang He wrote:
> In thunder_mmc_probe(), we should call of_node_put() when breaking
> out of for_each_child_of_node() which has increased and decreased
> the refcount during each iteration.
> 
> Fixes: 166bac38c3c5 ("mmc: cavium: Add MMC PCI driver for ThunderX SOCs")
> Signed-off-by: Liang He <windhl@126.com>

Acked-by: Robert Richter <rric@kernel.org>

> ---
>  drivers/mmc/host/cavium-thunderx.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
Ulf Hansson July 21, 2022, 4:13 p.m. UTC | #3
On Tue, 19 Jul 2022 at 11:52, Liang He <windhl@126.com> wrote:
>
> In octeon_mmc_probe(), we should call of_node_put() when breaking
> out of for_each_child_of_node() which has increased and decreased
> the refcount during each iteration.
>
> Fixes: 01d95843335c ("mmc: cavium: Add MMC support for Octeon SOCs.")
> Signed-off-by: Liang He <windhl@126.com>

Applied for next, thanks!

Kind regards

Ulf Hansson

> ---
>  drivers/mmc/host/cavium-octeon.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/mmc/host/cavium-octeon.c b/drivers/mmc/host/cavium-octeon.c
> index 2c4b2df52adb..12dca91a8ef6 100644
> --- a/drivers/mmc/host/cavium-octeon.c
> +++ b/drivers/mmc/host/cavium-octeon.c
> @@ -277,6 +277,7 @@ static int octeon_mmc_probe(struct platform_device *pdev)
>                 if (ret) {
>                         dev_err(&pdev->dev, "Error populating slots\n");
>                         octeon_mmc_set_shared_power(host, 0);
> +                       of_node_put(cn);
>                         goto error;
>                 }
>                 i++;
> --
> 2.25.1
>
Ulf Hansson July 21, 2022, 4:13 p.m. UTC | #4
On Tue, 19 Jul 2022 at 11:52, Liang He <windhl@126.com> wrote:
>
> In thunder_mmc_probe(), we should call of_node_put() when breaking
> out of for_each_child_of_node() which has increased and decreased
> the refcount during each iteration.
>
> Fixes: 166bac38c3c5 ("mmc: cavium: Add MMC PCI driver for ThunderX SOCs")
> Signed-off-by: Liang He <windhl@126.com>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/cavium-thunderx.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/cavium-thunderx.c b/drivers/mmc/host/cavium-thunderx.c
> index 76013bbbcff3..202b1d6da678 100644
> --- a/drivers/mmc/host/cavium-thunderx.c
> +++ b/drivers/mmc/host/cavium-thunderx.c
> @@ -142,8 +142,10 @@ static int thunder_mmc_probe(struct pci_dev *pdev,
>                                 continue;
>
>                         ret = cvm_mmc_of_slot_probe(&host->slot_pdev[i]->dev, host);
> -                       if (ret)
> +                       if (ret) {
> +                               of_node_put(child_node);
>                                 goto error;
> +                       }
>                 }
>                 i++;
>         }
> --
> 2.25.1
>
diff mbox series

Patch

diff --git a/drivers/mmc/host/cavium-octeon.c b/drivers/mmc/host/cavium-octeon.c
index 2c4b2df52adb..12dca91a8ef6 100644
--- a/drivers/mmc/host/cavium-octeon.c
+++ b/drivers/mmc/host/cavium-octeon.c
@@ -277,6 +277,7 @@  static int octeon_mmc_probe(struct platform_device *pdev)
 		if (ret) {
 			dev_err(&pdev->dev, "Error populating slots\n");
 			octeon_mmc_set_shared_power(host, 0);
+			of_node_put(cn);
 			goto error;
 		}
 		i++;