projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
treewide: Convert del_timer*() to timer_shutdown*()
[linux-block.git]
/
drivers
/
net
/
wireless
/
marvell
/
mwifiex
/
main.c
diff --git
a/drivers/net/wireless/marvell/mwifiex/main.c
b/drivers/net/wireless/marvell/mwifiex/main.c
index da2e6557e68414170fb27b94c9e273e1d77afe28..ea22a08e6c083ed7adfdb1d95fb3d2319c13b596 100644
(file)
--- a/
drivers/net/wireless/marvell/mwifiex/main.c
+++ b/
drivers/net/wireless/marvell/mwifiex/main.c
@@
-123,7
+123,7
@@
static int mwifiex_unregister(struct mwifiex_adapter *adapter)
if (adapter->if_ops.cleanup_if)
adapter->if_ops.cleanup_if(adapter);
-
del_timer
_sync(&adapter->cmd_timer);
+
timer_shutdown
_sync(&adapter->cmd_timer);
/* Free private structures */
for (i = 0; i < adapter->priv_num; i++) {