summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Büsch <m@bues.ch>2011-11-16 23:51:20 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-11-17 15:45:16 -0500
commit7adb92faa852589ad60ebd5ff94fc53c0882ebd5 (patch)
tree7672e1f20d343d573a708402e79c2513dfa513b2
parentfcac4fb00eaefea375db9745464cc182389a1751 (diff)
p54spi: Remove FIXME in op_stop
Don't use the interruptible variant of mutex_lock(). It doesn't really need to be interruptible. This avoids nasty error handling. Signed-off-by: Michael Buesch <m@bues.ch> Acked-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/p54/p54spi.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index f18df82eeb9..a454d487b14 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/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);