rfkill: error cannot be set here so simplify

Alan Cox · Jiri Kosina · commit 6f7c962c0b8e · 2012-10-25T17:58:41.000+02:00
Signed-off-by: Alan Cox &lt;alan@linux.intel.com&gt;
Signed-off-by: Jiri Kosina &lt;jkosina@suse.cz&gt;
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ static ssize_t rfkill_soft_store(struct device *dev,`
`656`	`656`	`rfkill_set_block(rfkill, state);`
`657`	`657`	`mutex_unlock(&rfkill_global_mutex);`
`658`	`658`
`659`		`- return err ?: count;`
	`659`	`+ return count;`
`660`	`660`	`}`
`661`	`661`
`662`	`662`	`static u8 user_state_from_blocked(unsigned long state)`
`@@ -701,7 +701,7 @@ static ssize_t rfkill_state_store(struct device *dev,`
`701`	`701`	`rfkill_set_block(rfkill, state == RFKILL_USER_STATE_SOFT_BLOCKED);`
`702`	`702`	`mutex_unlock(&rfkill_global_mutex);`
`703`	`703`
`704`		`- return err ?: count;`
	`704`	`+ return count;`
`705`	`705`	`}`
`706`	`706`
`707`	`707`	`static ssize_t rfkill_claim_show(struct device *dev,`