Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 79159
b: refs/heads/master
c: b15152a
h: refs/heads/master
i:
  79157: d30fc0c
  79155: 1bef00a
  79151: e9cdea9
v: v3
  • Loading branch information
David Woodhouse authored and David S. Miller committed Jan 28, 2008
1 parent 0f66133 commit a472d37
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4f82f5c853e314dfe877b87b4c1e4b127ee9a34b
refs/heads/master: b15152a4033d4c82015bb79c6b81eeb0a2edeeea
5 changes: 5 additions & 0 deletions trunk/drivers/net/wireless/libertas/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit a472d37

Please sign in to comment.