diff options
| author |   Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2014-11-06 17:02:13 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-11-06 19:00:15 -0500 |
| commit | e98c72c94205c59745f9ed0ac2837d5b83084a46 (patch) | |
| tree | b441cd6b39be96e098cdb7f6fc988de838de70e0 /drivers/net/ethernet/amd/xgbe/xgbe-drv.c | |
| parent | Merge branch 'net_next_ovs' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch (diff) | |
| download | linux-dev-e98c72c94205c59745f9ed0ac2837d5b83084a46.tar.xz linux-dev-e98c72c94205c59745f9ed0ac2837d5b83084a46.zip | |
amd-xgbe: Free channel/ring structures later
The channel structure is freed before freeing the per channel
interrupts resulting in a kernel oops. Move the call to free
the channel structure to after the freeing of the per channel
interrupts.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index ced9f52eb45b..ec5fff38108d 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c @@ -1369,9 +1369,6 @@ static int xgbe_close(struct net_device *netdev) /* Free the ring descriptors and buffers */ desc_if->free_ring_resources(pdata); - /* Free the channel and ring structures */ - xgbe_free_channels(pdata); - /* Release the interrupts */ devm_free_irq(pdata->dev, pdata->dev_irq, pdata); if (pdata->per_channel_irq) { @@ -1380,6 +1377,9 @@ static int xgbe_close(struct net_device *netdev) devm_free_irq(pdata->dev, channel->dma_irq, channel); } + /* Free the channel and ring structures */ + xgbe_free_channels(pdata); + /* Disable the clocks */ clk_disable_unprepare(pdata->ptpclk); clk_disable_unprepare(pdata->sysclk); |