---

yaml --- r: 121573 b: refs/heads/master c: cf4b4aa h: refs/heads/master i: 121571: 2f535c8 v: v3
git-mirror · Oct 31, 2008 · ab6f2d4 · ab6f2d4
1 parent 9b2afe1
commit ab6f2d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8975581f63870be42ff4662b293d1b0c8c21350
+refs/heads/master: cf4b4aab552f5f658ed400dd0cd41f9ac8aac7c1
diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c
@@ -431,8 +431,9 @@ static ssize_t rfkill_state_store(struct device *dev,
 	    state != RFKILL_STATE_SOFT_BLOCKED)
 		return -EINVAL;
 
-	if (mutex_lock_interruptible(&rfkill->mutex))
-		return -ERESTARTSYS;
+	error = mutex_lock_killable(&rfkill->mutex);
+	if (error)
+		return error;
 	error = rfkill_toggle_radio(rfkill, state, 0);
 	mutex_unlock(&rfkill->mutex);
 
@@ -472,7 +473,7 @@ static ssize_t rfkill_claim_store(struct device *dev,
 	 * Take the global lock to make sure the kernel is not in
 	 * the middle of rfkill_switch_all
 	 */
-	error = mutex_lock_interruptible(&rfkill_global_mutex);
+	error = mutex_lock_killable(&rfkill_global_mutex);
 	if (error)
 		return error;