From c00fe09af6b34b0386aa6ffd2dd55b500a7c995f Mon Sep 17 00:00:00 2001 From: Holger Schurig Date: Fri, 23 May 2008 10:07:56 +0200 Subject: [PATCH] --- yaml --- r: 102787 b: refs/heads/master c: b43441a49d1c64769ff90f34e9543b2ba840b517 h: refs/heads/master i: 102785: f3203b3f938977ccf8574209ee7ddb66581d4ede 102783: 6f3fb2d95cf9df953d16941501b6d266ad5e1274 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/main.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0c76c1dd0981..9c6c1809ee9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23c0752a25d73ccc4547700e8a57d5ae2f2edf56 +refs/heads/master: b43441a49d1c64769ff90f34e9543b2ba840b517 diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c index baafa44cfb30..0cd4702d2f76 100644 --- a/trunk/drivers/net/wireless/libertas/main.c +++ b/trunk/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 "