From 7264ad56b6902dd94835d497dde683ffadd58250 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 25 Oct 2012 15:18:34 +0100 Subject: [PATCH] --- yaml --- r: 343014 b: refs/heads/master c: 6f7c962c0b8efc78aec4c5514865fb5be83f4d92 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/rfkill/core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ac1a1ccddabc..8c40aebd10e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db8310183ae493d5229e9a4018bc5df59cc31d98 +refs/heads/master: 6f7c962c0b8efc78aec4c5514865fb5be83f4d92 diff --git a/trunk/net/rfkill/core.c b/trunk/net/rfkill/core.c index 752b72360ebc..61c112c890a9 100644 --- a/trunk/net/rfkill/core.c +++ b/trunk/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,