This is a note to let you know that I've just added the patch titled rt2x00: Fix incorrect usage of CONFIG_RT2X00_LIB_USB to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: rt2x00-fix-incorrect-usage-of-config_rt2x00_lib_usb.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From a083c8fd277b4122c804f18ec8c84165f345c71c Mon Sep 17 00:00:00 2001 From: Vishal Thanki <vishalthanki@xxxxxxxxx> Date: Wed, 16 Nov 2016 17:01:54 +0100 Subject: rt2x00: Fix incorrect usage of CONFIG_RT2X00_LIB_USB From: Vishal Thanki <vishalthanki@xxxxxxxxx> commit a083c8fd277b4122c804f18ec8c84165f345c71c upstream. In device removal routine, usage of "#ifdef CONFIG_RT2X00_LIB_USB" will not cover the case when it is configured as module. This will omit the entire if-block which does cleanup of URBs and cancellation of pending work. Changing the #ifdef to #if IS_ENABLED() to fix it. Signed-off-by: Vishal Thanki <vishalthanki@xxxxxxxxx> Acked-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx> Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx> Signed-off-by: Amit Pundir <amit.pundir@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c @@ -1422,7 +1422,7 @@ void rt2x00lib_remove_dev(struct rt2x00_ cancel_work_sync(&rt2x00dev->intf_work); cancel_delayed_work_sync(&rt2x00dev->autowakeup_work); cancel_work_sync(&rt2x00dev->sleep_work); -#ifdef CONFIG_RT2X00_LIB_USB +#if IS_ENABLED(CONFIG_RT2X00_LIB_USB) if (rt2x00_is_usb(rt2x00dev)) { usb_kill_anchored_urbs(rt2x00dev->anchor); hrtimer_cancel(&rt2x00dev->txstatus_timer); Patches currently in stable-queue which might be from vishalthanki@xxxxxxxxx are queue-4.9/rt2x00-fix-incorrect-usage-of-config_rt2x00_lib_usb.patch queue-4.9/rt2x00usb-fix-anchor-initialization.patch queue-4.9/rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch