projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
r8169.c
diff --git
a/drivers/net/r8169.c
b/drivers/net/r8169.c
index 53b13deade9528539ea2dcaf5fe268b0e1ceabda..4e745af96cf1353ad680eac5c7e70038816e7257 100644
(file)
--- a/
drivers/net/r8169.c
+++ b/
drivers/net/r8169.c
@@
-3250,7
+3250,7
@@
static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
struct net_device *dev = pci_get_drvdata(pdev);
struct rtl8169_private *tp = netdev_priv(dev);
-
flush_scheduled_work(
);
+
cancel_delayed_work_sync(&tp->task
);
unregister_netdev(dev);
unregister_netdev(dev);