| From 3a11f7e6683ce11abc3c122366ee442ba78667e2 Mon Sep 17 00:00:00 2001 |
| From: Vishal Thanki <vishalthanki@gmail.com> |
| Date: Wed, 16 Nov 2016 17:01:54 +0100 |
| Subject: [PATCH] rt2x00: Fix incorrect usage of CONFIG_RT2X00_LIB_USB |
| |
| 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@gmail.com> |
| Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c |
| index 4e0c5653054b..b7273be9303d 100644 |
| --- 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_dev *rt2x00dev) |
| 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); |
| -- |
| 2.12.0 |
| |
