diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-20 14:37:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-20 14:37:10 -0800 |
| commit | 518aa1b5443c8a36300c20a5473df01fb8975dad (patch) | |
| tree | 0fe7200d4061dbfcd9b58b8f5f9264edbd9f7c05 /drivers/net/wireless/rt2x00/rt2x00rfkill.c | |
| parent | 66f9a2590aa87dc77cddaeaf46177de76edd2339 (diff) | |
| parent | 674743033c1ae9f7cc94e1e0037f6f719e6d1d67 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00rfkill.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00rfkill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c index c3f53a92180..3298cae1e12 100644 --- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c +++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c @@ -162,7 +162,7 @@ void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev) void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev) { - if (!test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->flags)) + if (!test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state)) return; cancel_delayed_work_sync(&rt2x00dev->rfkill_work); |