diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2007-10-06 08:14:06 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:55:11 -0400 |
commit | 81873e9ccd5731ca77027bdb32b34904e7af25d0 (patch) | |
tree | 887b887328ffb43cdba1acff995f51eed4eb26d1 /drivers/net/wireless/rt2x00/rt2x00lib.h | |
parent | 5886d0dbf5b4226c6b6c8c44c555c5dd83c67b02 (diff) |
[PATCH] rt2x00: Fix rfkill handling
As reported by Modestas Vainius, enabling rkfill in 1 driver and
disabling it in a second could cause a NULL pointer exception when
the rfkill-disabled driver still sets the CONFIG_SUPPORT_HW_BUTTON flag.
Furthermore, rfkill expects the timeout as a value in milliseconds
instead of jiffies. Also increase the timeout to a second,
since this 250ms would be overkill.
Also the flag DEVICE_ENABLED_RADIO_HW is causing problems
for devices which do not support the hardware button
while rfkill is enabled in the driver.
To remidy this we should inverse the flag and its meaning,
rename the flag to DEVICE_DISABLED_RADIO_HW this means that
by default the radio is enabled by the hardware button (if present)
and can only be disabled explicitely.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00lib.h')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00lib.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h index 6dd92eb2b223..0ab39cad3cc8 100644 --- a/drivers/net/wireless/rt2x00/rt2x00lib.h +++ b/drivers/net/wireless/rt2x00/rt2x00lib.h | |||
@@ -28,9 +28,10 @@ | |||
28 | 28 | ||
29 | /* | 29 | /* |
30 | * Interval defines | 30 | * Interval defines |
31 | * Both the link tuner as the rfkill will be called once per second. | ||
31 | */ | 32 | */ |
32 | #define LINK_TUNE_INTERVAL ( round_jiffies(HZ) ) | 33 | #define LINK_TUNE_INTERVAL ( round_jiffies(HZ) ) |
33 | #define RFKILL_POLL_INTERVAL ( HZ / 4 ) | 34 | #define RFKILL_POLL_INTERVAL ( 1000 ) |
34 | 35 | ||
35 | /* | 36 | /* |
36 | * Radio control handlers. | 37 | * Radio control handlers. |
@@ -98,13 +99,6 @@ void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev); | |||
98 | #else | 99 | #else |
99 | static inline int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev) | 100 | static inline int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev) |
100 | { | 101 | { |
101 | /* | ||
102 | * Force enable this flag, this will assure that | ||
103 | * devices with a hardware button but without rfkill support | ||
104 | * can still use their hardware. | ||
105 | */ | ||
106 | __set_bit(DEVICE_ENABLED_RADIO_HW, &rt2x00dev->flags); | ||
107 | |||
108 | return 0; | 102 | return 0; |
109 | } | 103 | } |
110 | 104 | ||