aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-11 11:55:37 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:06:40 -0500
commitb15152a4033d4c82015bb79c6b81eeb0a2edeeea (patch)
tree0a461163949b438e7c46525fb6eacf907866c84c /drivers/net
parent4f82f5c853e314dfe877b87b4c1e4b127ee9a34b (diff)
libertas: don't run thread while firmware not yet ready
Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/libertas/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 88664024bf80..9a231099212f 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -671,6 +671,8 @@ static int lbs_thread(void *data)
671 shouldsleep = 1; /* Sleep mode. Nothing we can do till it wakes */ 671 shouldsleep = 1; /* Sleep mode. Nothing we can do till it wakes */
672 else if (priv->intcounter) 672 else if (priv->intcounter)
673 shouldsleep = 0; /* Interrupt pending. Deal with it now */ 673 shouldsleep = 0; /* Interrupt pending. Deal with it now */
674 else if (!priv->fw_ready)
675 shouldsleep = 1; /* Firmware not ready. We're waiting for it */
674 else if (priv->dnld_sent) 676 else if (priv->dnld_sent)
675 shouldsleep = 1; /* Something is en route to the device already */ 677 shouldsleep = 1; /* Something is en route to the device already */
676 else if (priv->tx_pending_len > 0) 678 else if (priv->tx_pending_len > 0)
@@ -753,6 +755,9 @@ static int lbs_thread(void *data)
753 } else 755 } else
754 spin_unlock_irq(&priv->driver_lock); 756 spin_unlock_irq(&priv->driver_lock);
755 757
758 if (!priv->fw_ready)
759 continue;
760
756 /* Check if we need to confirm Sleep Request received previously */ 761 /* Check if we need to confirm Sleep Request received previously */
757 if (priv->psstate == PS_STATE_PRE_SLEEP && 762 if (priv->psstate == PS_STATE_PRE_SLEEP &&
758 !priv->dnld_sent && !priv->cur_cmd) { 763 !priv->dnld_sent && !priv->cur_cmd) {