diff options
| author |   Cyrille Pitchen <cyrille.pitchen@atmel.com> | 2014-12-15 15:13:31 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-12-15 11:50:45 -0500 |
| commit | e965be7d17b9c82424cbb079506f0f9a4f41656c (patch) | |
| tree | 7226f000d332ef6896a6005f4fba89b89f14d78f | |
| parent | rds: Fix min() warning in rds_message_inc_copy_to_user() (diff) | |
| download | linux-dev-e965be7d17b9c82424cbb079506f0f9a4f41656c.tar.xz linux-dev-e965be7d17b9c82424cbb079506f0f9a4f41656c.zip | |
net/macb: fix misplaced call of free_netdev() in macb_remove()
fix a bug introduced by the multiqueue support patch:
"net/macb: add TX multiqueue support for gem"
the "bp" pointer to the netdev private data was dereferenced and used after the
associated memory had been freed by calling free_netdev().
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/cadence/macb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 06dea3dd463c..84029ed96d6f 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2408,11 +2408,11 @@ static int __exit macb_remove(struct platform_device *pdev) queue = bp->queues; for (q = 0; q < bp->num_queues; ++q, ++queue) devm_free_irq(&pdev->dev, queue->irq, queue); - free_netdev(dev); if (!IS_ERR(bp->tx_clk)) clk_disable_unprepare(bp->tx_clk); clk_disable_unprepare(bp->hclk); clk_disable_unprepare(bp->pclk); + free_netdev(dev); } return 0; |