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>

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 752b723..61c112c 100644 (file)
--- 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,