From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 28 Nov 2011 19:11:18 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: firefly_0821_release~3680^2~3834^2~445^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=39338b56382ac640614851a80e0bd71994cc664d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
---

39338b56382ac640614851a80e0bd71994cc664d
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);