From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 24 Nov 2011 02:24:07 +0000 (+1100)
Subject: Merge remote-tracking branch 'wireless-next/master'
X-Git-Tag: next-20111124~46
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=239427591879ba228ba6aacc6fc13a42d85194af;p=karo-tx-linux.git

Merge remote-tracking branch 'wireless-next/master'
---

239427591879ba228ba6aacc6fc13a42d85194af
diff --cc drivers/net/wireless/p54/p54spi.c
index 78d0d6988553,a454d487b14f..2d5cf5ba319b
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@@ -581,13 -581,11 +581,9 @@@ static void p54spi_op_stop(struct ieee8
  	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);
 -
  	p54spi_power_off(priv);
  	spin_lock_irqsave(&priv->tx_lock, flags);
  	INIT_LIST_HEAD(&priv->tx_pending);