diff options
| author | Chen, Chien-Chia <machen@suse.com> | 2012-03-29 18:21:47 +0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-10 14:14:28 -0400 |
| commit | e2bc7c5f3cb8756865aa0ab140d2288f61599dda (patch) | |
| tree | 7cdbfbba1912292d50dcf72f51b5c11982ccab30 /drivers/net | |
| parent | 58f743ee06d400a887a3e30353c69c3151eb64df (diff) | |
| download | linux-3.10-e2bc7c5f3cb8756865aa0ab140d2288f61599dda.tar.gz linux-3.10-e2bc7c5f3cb8756865aa0ab140d2288f61599dda.tar.bz2 linux-3.10-e2bc7c5f3cb8756865aa0ab140d2288f61599dda.zip | |
rt2x00: Fix rfkill_polling register function.
Move rt2x00rfkill_register(rt2x00dev) to rt2x00lib_probe_dev
function. It fixes of starting rfkill_poll function at the
right time if sets hard rfkill block and reboot. rt2x00mac_rfkill_poll
should be starting before bringing up the wireless interface.
Signed-off-by: Chen, Chien-Chia <machen@suse.com>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
CC: Kevin Chou <kevin.chou@mediatek.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index fc9901e027c..90cc5e77265 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -1062,11 +1062,6 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev) set_bit(DEVICE_STATE_INITIALIZED, &rt2x00dev->flags); - /* - * Register the extra components. - */ - rt2x00rfkill_register(rt2x00dev); - return 0; } @@ -1210,6 +1205,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) rt2x00link_register(rt2x00dev); rt2x00leds_register(rt2x00dev); rt2x00debug_register(rt2x00dev); + rt2x00rfkill_register(rt2x00dev); return 0; |