From a472d37aa6109d0e81a905cd8dd21370aa5b5915 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Tue, 11 Dec 2007 11:55:37 -0500 Subject: [PATCH] --- yaml --- r: 79159 b: refs/heads/master c: b15152a4033d4c82015bb79c6b81eeb0a2edeeea h: refs/heads/master i: 79157: d30fc0cc8d7671987ce074c8723675c04d066213 79155: 1bef00a60f27593b18181e6af2630fb66ba54c18 79151: e9cdea99c8dc193d8c897004c0a3213e8b2610e3 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2b303dfa9981..993f82ca5107 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f82f5c853e314dfe877b87b4c1e4b127ee9a34b +refs/heads/master: b15152a4033d4c82015bb79c6b81eeb0a2edeeea diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c index 88664024bf80..9a231099212f 100644 --- a/trunk/drivers/net/wireless/libertas/main.c +++ b/trunk/drivers/net/wireless/libertas/main.c @@ -671,6 +671,8 @@ static int lbs_thread(void *data) shouldsleep = 1; /* Sleep mode. Nothing we can do till it wakes */ else if (priv->intcounter) shouldsleep = 0; /* Interrupt pending. Deal with it now */ + else if (!priv->fw_ready) + shouldsleep = 1; /* Firmware not ready. We're waiting for it */ else if (priv->dnld_sent) shouldsleep = 1; /* Something is en route to the device already */ else if (priv->tx_pending_len > 0) @@ -753,6 +755,9 @@ static int lbs_thread(void *data) } else spin_unlock_irq(&priv->driver_lock); + if (!priv->fw_ready) + continue; + /* Check if we need to confirm Sleep Request received previously */ if (priv->psstate == PS_STATE_PRE_SLEEP && !priv->dnld_sent && !priv->cur_cmd) {