]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
fec: Remove irqs first
authorFabio Estevam <fabio.estevam@freescale.com>
Mon, 27 May 2013 03:48:32 +0000 (03:48 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 May 2013 05:29:54 +0000 (22:29 -0700)
During probe the clocks are enabled prior than the acquiring the interrupts.

In the remove function we need to do the opposite: first remove the interrupts
and then disable the clocks.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/fec_main.c

index 58ac0c76441f1c9705c6ea23825c3c23fb053d7e..cac667db61becb77ee30e8a11ca4f564f0ac7aae 100644 (file)
@@ -2009,6 +2009,11 @@ fec_drv_remove(struct platform_device *pdev)
        unregister_netdev(ndev);
        fec_enet_mii_remove(fep);
        del_timer_sync(&fep->time_keep);
+       for (i = 0; i < FEC_IRQ_NUM; i++) {
+               int irq = platform_get_irq(pdev, i);
+               if (irq > 0)
+                       free_irq(irq, ndev);
+       }
        if (fep->reg_phy)
                regulator_disable(fep->reg_phy);
        clk_disable_unprepare(fep->clk_ptp);
@@ -2017,11 +2022,6 @@ fec_drv_remove(struct platform_device *pdev)
        clk_disable_unprepare(fep->clk_enet_out);
        clk_disable_unprepare(fep->clk_ahb);
        clk_disable_unprepare(fep->clk_ipg);
-       for (i = 0; i < FEC_IRQ_NUM; i++) {
-               int irq = platform_get_irq(pdev, i);
-               if (irq > 0)
-                       free_irq(irq, ndev);
-       }
        free_netdev(ndev);
 
        platform_set_drvdata(pdev, NULL);