diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-11-25 15:30:10 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 15:30:10 -0800 |
| commit | f19f8d8ebc0b392c01082e0feb44ec152cc47a30 (patch) | |
| tree | f45f5391e97e29d5ef0003fc90f34bf0e18ba20f /drivers/net/ethernet/via/via-rhine.c | |
| parent | f984370913d3ba5d13806cc8ac6fc26f8ebd1694 (diff) | |
| parent | 6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (diff) | |
Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal
Diffstat (limited to 'drivers/net/ethernet/via/via-rhine.c')
| -rw-r--r-- | drivers/net/ethernet/via/via-rhine.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index bdf697b184a..cce6c4bc556 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -987,6 +987,9 @@ static int rhine_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rp->base = ioaddr; + u64_stats_init(&rp->tx_stats.syncp); + u64_stats_init(&rp->rx_stats.syncp); + /* Get chip registers into a sane state */ rhine_power_init(dev); rhine_hw_init(dev, pioaddr); @@ -2292,7 +2295,6 @@ static void rhine_remove_one(struct pci_dev *pdev) free_netdev(dev); pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); } static void rhine_shutdown (struct pci_dev *pdev) |