p54spi: Remove FIXME in op_stop
authorMichael Büsch <m@bues.ch>
Wed, 16 Nov 2011 22:51:20 +0000 (23:51 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 17 Nov 2011 20:45:16 +0000 (15:45 -0500)
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>
drivers/net/wireless/p54/p54spi.c

index f18df82eeb92caccedb8381bb95e4f55cd4d1901..a454d487b14fb0fbaa2b569881a750fb506b6a1c 100644 (file)
@@ -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);