git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ 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
[safe/jmp/linux-2.6]
/
drivers
/
net
/
usb
/
kaweth.c
diff --git
a/drivers/net/usb/kaweth.c
b/drivers/net/usb/kaweth.c
index
0dcfc03
..
7c66b05
100644
(file)
--- a/
drivers/net/usb/kaweth.c
+++ b/
drivers/net/usb/kaweth.c
@@
-706,7
+706,7
@@
static void kaweth_kill_urbs(struct kaweth_device *kaweth)
usb_kill_urb(kaweth->rx_urb);
usb_kill_urb(kaweth->tx_urb);
-
flush_scheduled_work(
);
+
cancel_delayed_work_sync(&kaweth->lowmem_work
);
/* a scheduled work may have resubmitted,
we hit them again */