aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2007-10-27 07:40:51 -0400
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:02:58 -0500
commitd9890b8f45158970f3418d0c9c0b3bfde13d3a4f (patch)
tree0f1044bb2cf7c6023af557703db850e2631df15b
parent4300beb47dd96ccaf5fa1a7550f6f6f15d045b30 (diff)
rt2x00: Detect initial rfkill state on register
When registering rfkill, make sure a initial poll event is directly executed to detect the initial rfkill state and send the event to the rfkill layer. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00rfkill.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
index db513f141bec..16d365deefd1 100644
--- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
@@ -94,6 +94,13 @@ int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
94 return retval; 94 return retval;
95 } 95 }
96 96
97 /*
98 * Force initial poll which will detect the initial device state,
99 * and correctly sends the signal to the rfkill layer about this
100 * state.
101 */
102 rt2x00rfkill_poll(rt2x00dev->poll_dev);
103
97 return 0; 104 return 0;
98} 105}
99 106
@@ -121,7 +128,7 @@ int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
121 128
122 rt2x00dev->rfkill->name = rt2x00dev->ops->name; 129 rt2x00dev->rfkill->name = rt2x00dev->ops->name;
123 rt2x00dev->rfkill->data = rt2x00dev; 130 rt2x00dev->rfkill->data = rt2x00dev;
124 rt2x00dev->rfkill->state = rt2x00dev->ops->lib->rfkill_poll(rt2x00dev); 131 rt2x00dev->rfkill->state = -1;
125 rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio; 132 rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio;
126 133
127 rt2x00dev->poll_dev = input_allocate_polled_device(); 134 rt2x00dev->poll_dev = input_allocate_polled_device();