projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e3e66e
)
rt2x00: fix cancelling uninitialized work
author
Stanislaw Gruszka
<
[email protected]
>
Mon, 4 Apr 2011 11:50:32 +0000
(13:50 +0200)
committer
John W. Linville
<
[email protected]
>
Mon, 4 Apr 2011 19:22:13 +0000
(15:22 -0400)
{rx,tx}done_work's are only initialized for usb devices.
Signed-off-by: Stanislaw Gruszka <
[email protected]
>
Cc:
[email protected]
Acked-by: Ivo van Doorn <
[email protected]
>
Signed-off-by: John W. Linville <
[email protected]
>
drivers/net/wireless/rt2x00/rt2x00dev.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/rt2x00/rt2x00dev.c
b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 9de9dbe943998e1790a8d514157eea8028410238..84eb6ad3637752c686a9cd8d1be0e058cacda162 100644
(file)
--- a/
drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/
drivers/net/wireless/rt2x00/rt2x00dev.c
@@
-1062,8
+1062,10
@@
void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
* Stop all work.
*/
cancel_work_sync(&rt2x00dev->intf_work);
- cancel_work_sync(&rt2x00dev->rxdone_work);
- cancel_work_sync(&rt2x00dev->txdone_work);
+ if (rt2x00_is_usb(rt2x00dev)) {
+ cancel_work_sync(&rt2x00dev->rxdone_work);
+ cancel_work_sync(&rt2x00dev->txdone_work);
+ }
destroy_workqueue(rt2x00dev->workqueue);
/*