diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-10-25 10:18:34 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-25 11:58:41 -0400 |
| commit | 6f7c962c0b8efc78aec4c5514865fb5be83f4d92 (patch) | |
| tree | 49fee98986a52d2ebdd62dbf21131ab6fe4f0120 /net/rfkill | |
| parent | db8310183ae493d5229e9a4018bc5df59cc31d98 (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/rfkill')
| -rw-r--r-- | net/rfkill/core.c | 4 |
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, | |||
| 656 | rfkill_set_block(rfkill, state); | 656 | rfkill_set_block(rfkill, state); |
| 657 | mutex_unlock(&rfkill_global_mutex); | 657 | mutex_unlock(&rfkill_global_mutex); |
| 658 | 658 | ||
| 659 | return err ?: count; | 659 | return count; |
| 660 | } | 660 | } |
| 661 | 661 | ||
| 662 | static u8 user_state_from_blocked(unsigned long state) | 662 | static u8 user_state_from_blocked(unsigned long state) |
| @@ -701,7 +701,7 @@ static ssize_t rfkill_state_store(struct device *dev, | |||
| 701 | rfkill_set_block(rfkill, state == RFKILL_USER_STATE_SOFT_BLOCKED); | 701 | rfkill_set_block(rfkill, state == RFKILL_USER_STATE_SOFT_BLOCKED); |
| 702 | mutex_unlock(&rfkill_global_mutex); | 702 | mutex_unlock(&rfkill_global_mutex); |
| 703 | 703 | ||
| 704 | return err ?: count; | 704 | return count; |
| 705 | } | 705 | } |
| 706 | 706 | ||
| 707 | static ssize_t rfkill_claim_show(struct device *dev, | 707 | static ssize_t rfkill_claim_show(struct device *dev, |