diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-13 11:23:24 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:51:16 -0500 |
| commit | 775ed8abde9420afc955ca7540aacdce721be6c1 (patch) | |
| tree | 7ff55b22f75b9d694382514f6d59c490f5d1df1c /drivers/net/wireless/iwlegacy/common.h | |
| parent | c37281a076604937ec2403f3cfec71362f93c7d8 (diff) | |
| download | linux-stable-775ed8abde9420afc955ca7540aacdce721be6c1.tar.gz linux-stable-775ed8abde9420afc955ca7540aacdce721be6c1.tar.bz2 linux-stable-775ed8abde9420afc955ca7540aacdce721be6c1.zip | |
iwlegacy: do not grab nic access if rfkill
If rfkill is on il_grab_nic_access() fail and we can not write to the
various registers during stop procedure. Write to those registers
unconditionally instead.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.h')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h index a7794459d747..13bfd4394f91 100644 --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h @@ -1976,7 +1976,9 @@ il_is_ready_rf(struct il_priv *il) extern void il_send_bt_config(struct il_priv *il); extern int il_send_stats_request(struct il_priv *il, u8 flags, bool clear); -void il_apm_stop(struct il_priv *il); +extern void il_apm_stop(struct il_priv *il); +extern void _il_apm_stop(struct il_priv *il); + int il_apm_init(struct il_priv *il); int il_send_rxon_timing(struct il_priv *il); |