summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2008-05-23 10:07:56 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-06-03 15:00:15 -0400
commitb43441a49d1c64769ff90f34e9543b2ba840b517 (patch)
tree77bc15646d3728155555bac3534989b8a397695b
parent23c0752a25d73ccc4547700e8a57d5ae2f2edf56 (diff)
downloadtalos-op-linux-b43441a49d1c64769ff90f34e9543b2ba840b517.tar.gz
talos-op-linux-b43441a49d1c64769ff90f34e9543b2ba840b517.zip
libertas: don't spin_unlock_irq() twice
priv->driver_lock has already been unlocked some lines above. This patch fixes the sparse warning: drivers/net/wireless/libertas/main.c:792:6: warning: context problem in 'lbs_thread': '_spin_unlock_irq' expected different context drivers/net/wireless/libertas/main.c:792:6: context 'lock': wanted >= 1, got 0 Signed-of-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/main.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index baafa44cfb30..0cd4702d2f76 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -788,11 +788,8 @@ static int lbs_thread(void *data)
le16_to_cpu(cmdnode->cmdbuf->command));
lbs_complete_command(priv, cmdnode, -ETIMEDOUT);
priv->nr_retries = 0;
- if (priv->reset_card) {
- spin_unlock_irq(&priv->driver_lock);
+ if (priv->reset_card)
priv->reset_card(priv);
- spin_lock_irq(&priv->driver_lock);
- }
} else {
priv->cur_cmd = NULL;
lbs_pr_info("requeueing command 0x%04x due "
OpenPOWER on IntegriCloud