Skip to contentSkip to conversation

rt2x00: Fix rmmod hang of rt2800pci

PATCH New Ivo van Doorn 1 participant 1 message May 7, 2011 Networking drivers (wireless)

lore
Share & tools
lore

Ivo van Doorn

author
#0 lore raw

PATCH 1/1 rt2x00: Fix rmmod hang of rt2800pci

From: Gertjan van Wingerde <[email protected]>

txstatus_timer should only be deleted for USB devices, as it is only initialized for USB devices.

Reported-by Andreas Hartmann <[email protected]>
Signed-off-by Gertjan van Wingerde <[email protected]>
Signed-off-by Ivo van Doorn <[email protected]>
---
 drivers/net/wireless/rt2x00/rt2x00dev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/rt2x00/rt2x00dev.c +1 -1
index 2eb5196..c018d67 100644
@@ -1159,9 +1159,9 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
 	/*
 	 * Stop all work.
 	 */
-	del_timer_sync(&rt2x00dev->txstatus_timer);
 	cancel_work_sync(&rt2x00dev->intf_work);
 	if (rt2x00_is_usb(rt2x00dev)) {
+		del_timer_sync(&rt2x00dev->txstatus_timer);
 		cancel_work_sync(&rt2x00dev->rxdone_work);
 		cancel_work_sync(&rt2x00dev->txdone_work);
 	}
Signature · 1 line
1.7.2.3