From: Michael Büsch <m@bues.ch>
Date: Wed, 16 Nov 2011 22:51:20 +0000 (+0100)
Subject: p54spi: Remove FIXME in op_stop
X-Git-Tag: v3.12-rc1~4160^2~44^2~387
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7adb92faa852589ad60ebd5ff94fc53c0882ebd5;p=kernel%2Fkernel-generic.git

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

diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index f18df82..a454d48 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);