diff options
author | Michael Büsch <m@bues.ch> | 2011-11-16 17:51:20 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-17 15:45:16 -0500 |
commit | 7adb92faa852589ad60ebd5ff94fc53c0882ebd5 (patch) | |
tree | 7672e1f20d343d573a708402e79c2513dfa513b2 /drivers/net/wireless/p54 | |
parent | fcac4fb00eaefea375db9745464cc182389a1751 (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>
Diffstat (limited to 'drivers/net/wireless/p54')
-rw-r--r-- | drivers/net/wireless/p54/p54spi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c index f18df82eeb92..a454d487b14f 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) | |||
581 | struct p54s_priv *priv = dev->priv; | 581 | struct p54s_priv *priv = dev->priv; |
582 | unsigned long flags; | 582 | unsigned long flags; |
583 | 583 | ||
584 | if (mutex_lock_interruptible(&priv->mutex)) { | 584 | mutex_lock(&priv->mutex); |
585 | /* FIXME: how to handle this error? */ | ||
586 | return; | ||
587 | } | ||
588 | |||
589 | WARN_ON(priv->fw_state != FW_STATE_READY); | 585 | WARN_ON(priv->fw_state != FW_STATE_READY); |
590 | 586 | ||
591 | cancel_work_sync(&priv->work); | 587 | cancel_work_sync(&priv->work); |