aboutsummaryrefslogtreecommitdiffstats
path: root/net/wimax/op-rfkill.c
diff options
context:
space:
mode:
authorInaky Perez-Gonzalez <inaky@linux.intel.com>2009-08-27 20:54:53 -0400
committerInaky Perez-Gonzalez <inaky@linux.intel.com>2009-10-19 02:55:34 -0400
commitc29eaf3faef7547ba72355bac44e9ca6ffdaee39 (patch)
treeaa622b0943b0aef40b449379dff1561770357af5 /net/wimax/op-rfkill.c
parent5b45bfe5010ae1ddaac463d1bcdb141a4ff4ff66 (diff)
wimax: indicate initial SW rfkill state is "blocked"
The WiMAX stack assumes that all WiMAX devices are SW OFF when they are initialized. The recent changes in the RFKILL stack thus cause an initial call after rfkill_register(), because by default, rfkill considers devices to be SW ON upon registration. So call rfkill_init_sw_state() to set it to SW OFF so rfkill_register() doesn't do that unnecessary step. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Diffstat (limited to 'net/wimax/op-rfkill.c')
-rw-r--r--net/wimax/op-rfkill.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wimax/op-rfkill.c b/net/wimax/op-rfkill.c
index 70ef4df863b9..40e1210cdbd8 100644
--- a/net/wimax/op-rfkill.c
+++ b/net/wimax/op-rfkill.c
@@ -355,6 +355,7 @@ int wimax_rfkill_add(struct wimax_dev *wimax_dev)
355 355
356 wimax_dev->rfkill = rfkill; 356 wimax_dev->rfkill = rfkill;
357 357
358 rfkill_init_sw_state(rfkill, 1);
358 result = rfkill_register(wimax_dev->rfkill); 359 result = rfkill_register(wimax_dev->rfkill);
359 if (result < 0) 360 if (result < 0)
360 goto error_rfkill_register; 361 goto error_rfkill_register;