| Message ID | 1479312114-9389-1-git-send-email-vishalthanki@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a083c8fd277b4122c804f18ec8c84165f345c71c |
| Delegated to: | Kalle Valo |
| Headers | show |
On Wed, Nov 16, 2016 at 05:01:54PM +0100, Vishal Thanki wrote: > 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>
Vishal Thanki <vishalthanki@gmail.com> wrote: > 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> Patch applied to wireless-drivers-next.git, thanks. a083c8fd277b rt2x00: Fix incorrect usage of CONFIG_RT2X00_LIB_USB
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c index 17a0c1b..eb7b714 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c @@ -1441,7 +1441,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);
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> --- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)