From 79b0b12b68a1d2fbbc8465d7375ef5c6141a8505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20B=C3=BCsch?= <m@bues.ch>
Date: Wed, 16 Nov 2011 23:51:20 +0100
Subject: [PATCH] --- yaml --- r: 278135 b: refs/heads/master c:
 7adb92faa852589ad60ebd5ff94fc53c0882ebd5 h: refs/heads/master i:   278133:
 0d6b21b566a301a20c272c50246a44365308dd57   278131:
 3f1fe7b94ee3dc9c4d683ddc183bea240c74fd6b   278127:
 4e482dab1e6112512f44bd1207acab9bcf748c31 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/wireless/p54/p54spi.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 23e8de72d3ef..82f40e4e2e59 100644
--- 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
index f18df82eeb92..a454d487b14f 100644
--- 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);