summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-10-25 15:18:34 +0100
committerJiri Kosina <jkosina@suse.cz>2012-10-25 17:58:41 +0200
commit6f7c962c0b8efc78aec4c5514865fb5be83f4d92 (patch)
tree49fee98986a52d2ebdd62dbf21131ab6fe4f0120 /net
parentdb8310183ae493d5229e9a4018bc5df59cc31d98 (diff)
rfkill: error cannot be set here so simplify
Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'net')
-rw-r--r--net/rfkill/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 752b72360ebc..61c112c890a9 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -656,7 +656,7 @@ static ssize_t rfkill_soft_store(struct device *dev,
rfkill_set_block(rfkill, state);
mutex_unlock(&rfkill_global_mutex);
- return err ?: count;
+ return count;
}
static u8 user_state_from_blocked(unsigned long state)
@@ -701,7 +701,7 @@ static ssize_t rfkill_state_store(struct device *dev,
rfkill_set_block(rfkill, state == RFKILL_USER_STATE_SOFT_BLOCKED);
mutex_unlock(&rfkill_global_mutex);
- return err ?: count;
+ return count;
}
static ssize_t rfkill_claim_show(struct device *dev,