git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
sky2.c
diff --git
a/drivers/net/sky2.c
b/drivers/net/sky2.c
index 68f728f0b600f962bb46422749b250faaeaea46f..7967240534d5b647d97313920c9d5ff7b2455bc0 100644
(file)
--- a/
drivers/net/sky2.c
+++ b/
drivers/net/sky2.c
@@
-4396,7
+4396,7
@@
static void sky2_shutdown(struct pci_dev *pdev)
if (!hw)
return;
-
napi_disable(&hw->napi
);
+
del_timer_sync(&hw->watchdog_timer
);
for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i];