diff options
author | David S. Miller <davem@davemloft.net> | 2009-06-11 17:11:33 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-11 17:11:33 -0700 |
commit | 3ee40c376ad3252d13946141588db7e2f435f958 (patch) | |
tree | 65bd16c024edab1ff74ad165779443edfaa26467 /net | |
parent | 670025478c2a687453cd1bac697d7d765843f59d (diff) | |
parent | 98eb0f53e2fc66482e2ea8033c58b20a079e5260 (diff) | |
download | linux-3.10-3ee40c376ad3252d13946141588db7e2f435f958.tar.gz linux-3.10-3ee40c376ad3252d13946141588db7e2f435f958.tar.bz2 linux-3.10-3ee40c376ad3252d13946141588db7e2f435f958.zip |
Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'net')
-rw-r--r-- | net/wimax/op-rfkill.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wimax/op-rfkill.c b/net/wimax/op-rfkill.c index bb102e4aa3e..70ef4df863b 100644 --- a/net/wimax/op-rfkill.c +++ b/net/wimax/op-rfkill.c @@ -113,7 +113,8 @@ void wimax_report_rfkill_hw(struct wimax_dev *wimax_dev, else wimax_state = WIMAX_ST_RADIO_OFF; - rfkill_set_hw_state(wimax_dev->rfkill, state == WIMAX_RF_OFF); + result = rfkill_set_hw_state(wimax_dev->rfkill, + state == WIMAX_RF_OFF); __wimax_state_change(wimax_dev, wimax_state); } |