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);