net: ethernet: davinci_emac: Fix Unbalanced pm_runtime_enable
authorNeil Armstrong <narmstrong@baylibre.com>
Wed, 20 Apr 2016 08:56:13 +0000 (10:56 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Apr 2016 18:57:47 +0000 (14:57 -0400)
In order to avoid an Unbalanced pm_runtime_enable in the DaVinci
emac driver when the device is removed and re-probed, and a
pm_runtime_disable() call in davinci_emac_remove().

Actually, using unbind/bind on a TI DM8168 SoC gives :
$ echo 4a120000.ethernet > /sys/bus/platform/drivers/davinci_emac/unbind
net eth1: DaVinci EMAC: davinci_emac_remove()
$ echo 4a120000.ethernet > /sys/bus/platform/drivers/davinci_emac/bind
davinci_emac 4a120000.ethernet: Unbalanced pm_runtime_enable

Cc: Brian Hutchinson <b.hutchman@gmail.com>
Fixes: 3ba97381343b ("net: ethernet: davinci_emac: add pm_runtime support")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/davinci_emac.c

index 5d9abedd6b757ca65000e5dea8155acf0eac9412..e9fe3fb6d109cc108c99a30ef5fec5011ae929b7 100644 (file)
@@ -2101,6 +2101,7 @@ static int davinci_emac_remove(struct platform_device *pdev)
        cpdma_ctlr_destroy(priv->dma);
 
        unregister_netdev(ndev);
+       pm_runtime_disable(&pdev->dev);
        free_netdev(ndev);
 
        return 0;