It is logical to cleanup in probe's error path in reverse order to
previous actions.  It also makes easier to add additional goto labels
within this error path.

Signed-off-by: Krzysztof Kozlowski <k...@kernel.org>

---

Not marking as cc-stable as this was not reproduced and not tested.
---
 drivers/power/supply/ab8500_btemp.c | 4 ++--
 drivers/power/supply/ab8500_fg.c    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/power/supply/ab8500_btemp.c 
b/drivers/power/supply/ab8500_btemp.c
index 8fe81259bfd9..a167938e32f2 100644
--- a/drivers/power/supply/ab8500_btemp.c
+++ b/drivers/power/supply/ab8500_btemp.c
@@ -1104,13 +1104,13 @@ static int ab8500_btemp_probe(struct platform_device 
*pdev)
        return ret;
 
 free_irq:
-       power_supply_unregister(di->btemp_psy);
-
        /* We also have to free all successfully registered irqs */
        for (i = i - 1; i >= 0; i--) {
                irq = platform_get_irq_byname(pdev, ab8500_btemp_irq[i].name);
                free_irq(irq, di);
        }
+
+       power_supply_unregister(di->btemp_psy);
 free_btemp_wq:
        destroy_workqueue(di->btemp_wq);
        return ret;
diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c
index 6fc4bc30644c..36bbb8ea05da 100644
--- a/drivers/power/supply/ab8500_fg.c
+++ b/drivers/power/supply/ab8500_fg.c
@@ -3212,15 +3212,15 @@ static int ab8500_fg_probe(struct platform_device *pdev)
        return ret;
 
 free_irq:
-       power_supply_unregister(di->fg_psy);
-
        /* We also have to free all registered irqs */
+       irq = platform_get_irq_byname(pdev, ab8500_fg_irq_bh[0].name);
+       free_irq(irq, di);
        for (i = 0; i < ARRAY_SIZE(ab8500_fg_irq_th); i++) {
                irq = platform_get_irq_byname(pdev, ab8500_fg_irq_th[i].name);
                free_irq(irq, di);
        }
-       irq = platform_get_irq_byname(pdev, ab8500_fg_irq_bh[0].name);
-       free_irq(irq, di);
+
+       power_supply_unregister(di->fg_psy);
 free_inst_curr_wq:
        destroy_workqueue(di->fg_wq);
        return ret;
-- 
2.17.1

Reply via email to