Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a24af11 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Fix rmmod hang of rt2800pci 



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

Reported-by: default avatarAndreas Hartmann <andihartmann@01019freenet.de>
Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1816fcdc

drivers/net/wireless/rt2x00/rt2x00dev.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1159,9 +1159,9 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) 
	/*

	/*

	 * Stop all work.

	 * Stop all work.

	 */

	 */

	del_timer_sync(&rt2x00dev->txstatus_timer);

	cancel_work_sync(&rt2x00dev->intf_work);

	cancel_work_sync(&rt2x00dev->intf_work);

	if (rt2x00_is_usb(rt2x00dev)) {

	if (rt2x00_is_usb(rt2x00dev)) {

		del_timer_sync(&rt2x00dev->txstatus_timer);

		cancel_work_sync(&rt2x00dev->rxdone_work);

		cancel_work_sync(&rt2x00dev->rxdone_work);

		cancel_work_sync(&rt2x00dev->txdone_work);

		cancel_work_sync(&rt2x00dev->txdone_work);

	}

	}