---

yaml --- r: 278135 b: refs/heads/master c: 7adb92f h: refs/heads/master i: 278133: 0d6b21b 278131: 3f1fe7b 278127: 4e482da v: v3
git-mirror · Nov 17, 2011 · 79b0b12 · 79b0b12
1 parent a2a8972
commit 79b0b12
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcac4fb00eaefea375db9745464cc182389a1751
+refs/heads/master: 7adb92faa852589ad60ebd5ff94fc53c0882ebd5
diff --git a/trunk/drivers/net/wireless/p54/p54spi.c b/trunk/drivers/net/wireless/p54/p54spi.c
@@ -581,11 +581,7 @@ static void p54spi_op_stop(struct ieee80211_hw *dev)
 	struct p54s_priv *priv = dev->priv;
 	unsigned long flags;
 
-	if (mutex_lock_interruptible(&priv->mutex)) {
-		/* FIXME: how to handle this error? */
-		return;
-	}
-
+	mutex_lock(&priv->mutex);
 	WARN_ON(priv->fw_state != FW_STATE_READY);
 
 	cancel_work_sync(&priv->work);