Merge tag 'iommu-updates-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / drivers / soc / fsl / qbman / qman_portal.c

diff --git a/drivers/soc/fsl/qbman/qman_portal.c b/drivers/soc/fsl/qbman/qman_portal.c
index bf38eb0..96f74a1 100644 (file)
--- a/drivers/soc/fsl/qbman/qman_portal.c
+++ b/drivers/soc/fsl/qbman/qman_portal.c
@@ -253,7 +253,7 @@ static int qman_portal_probe(struct platform_device *pdev)
                __qman_portals_probed = 1;
                /* unassigned portal, skip init */
                spin_unlock(&qman_lock);
-               return 0;
+               goto check_cleanup;
        }
 
        cpumask_set_cpu(cpu, &portal_cpus);
@@ -274,6 +274,7 @@ static int qman_portal_probe(struct platform_device *pdev)
        if (!cpu_online(cpu))
                qman_offline_cpu(cpu);
 
+check_cleanup:
        if (__qman_portals_probed == 1 && qman_requires_cleanup()) {
                /*
                 * QMan wasn't reset prior to boot (Kexec for example)