Commit 6f7c962c authored by Alan Cox's avatar Alan Cox Committed by Jiri Kosina

rfkill: error cannot be set here so simplify

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent db831018
...@@ -656,7 +656,7 @@ static ssize_t rfkill_soft_store(struct device *dev, ...@@ -656,7 +656,7 @@ static ssize_t rfkill_soft_store(struct device *dev,
rfkill_set_block(rfkill, state); rfkill_set_block(rfkill, state);
mutex_unlock(&rfkill_global_mutex); mutex_unlock(&rfkill_global_mutex);
return err ?: count; return count;
} }
static u8 user_state_from_blocked(unsigned long state) static u8 user_state_from_blocked(unsigned long state)
...@@ -701,7 +701,7 @@ static ssize_t rfkill_state_store(struct device *dev, ...@@ -701,7 +701,7 @@ static ssize_t rfkill_state_store(struct device *dev,
rfkill_set_block(rfkill, state == RFKILL_USER_STATE_SOFT_BLOCKED); rfkill_set_block(rfkill, state == RFKILL_USER_STATE_SOFT_BLOCKED);
mutex_unlock(&rfkill_global_mutex); mutex_unlock(&rfkill_global_mutex);
return err ?: count; return count;
} }
static ssize_t rfkill_claim_show(struct device *dev, static ssize_t rfkill_claim_show(struct device *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment