From 02365a032bc734e7dad49429eb66a763d73f5a56 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 2 Aug 2009 14:30:15 -0400 Subject: [PATCH] --- yaml --- r: 159395 b: refs/heads/master c: d8cc8926e9b4dc2ce513ee3325bf16b4ea6d94e8 h: refs/heads/master i: 159393: ec8086294067d74bd7af948571e912c411706bea 159391: 800e3acafffd3eb5ce2f548d93ea4f6eef9e67b8 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 453ace1c88e2..b3e1467b0657 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 117839bd1251dc654938c529c95c7611ac260351 +refs/heads/master: d8cc8926e9b4dc2ce513ee3325bf16b4ea6d94e8 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c index b717afbf3f38..db54fcc94c8f 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -892,6 +892,12 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) */ rt2x00lib_disable_radio(rt2x00dev); + /* + * Stop all work. + */ + cancel_work_sync(&rt2x00dev->filter_work); + cancel_work_sync(&rt2x00dev->intf_work); + /* * Uninitialize device. */