---

yaml --- r: 343014 b: refs/heads/master c: 6f7c962 h: refs/heads/master v: v3
git-mirror · Oct 25, 2012 · 7264ad5 · 7264ad5
1 parent 46d817d
commit 7264ad5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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,