summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2013-10-25 12:37:54 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-12-05 14:54:44 -0500
commit5f5deff34e4f9339e1e18a5af92fb1b79233783f (patch)
tree8b0ff5b74fcf430434fd953349e2cb335a868e60 /drivers/net/wireless/iwlegacy
parent60ce473e4938a42d355dd6c83e55211a08ebe25d (diff)
downloadlinux-5f5deff34e4f9339e1e18a5af92fb1b79233783f.tar.bz2
iwl3945: do not print RFKILL message
We can mess logs if user space try to open device again and again if RFKILL switch is on. Do not print message and return ERFKILL error instead to indicate where the problem is. Note that iwl4965 handle this problem differently, it allows to open device when radio is disabled. Reported-by: Dietmar Rudolph <dietmar@crlf.de> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
-rw-r--r--drivers/net/wireless/iwlegacy/3945-mac.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index 5c3bcedd679b..0487461ae4da 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -2396,8 +2396,7 @@ __il3945_up(struct il_priv *il)
clear_bit(S_RFKILL, &il->status);
else {
set_bit(S_RFKILL, &il->status);
- IL_WARN("Radio disabled by HW RF Kill switch\n");
- return -ENODEV;
+ return -ERFKILL;
}
_il_wr(il, CSR_INT, 0xFFFFFFFF);