From e6c015bd7dcae70bb4823a9f19e89d12a5d10256 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Mon, 30 Jul 2012 22:58:04 +0100
Subject: [PATCH] --- yaml --- r: 321471 b: refs/heads/master c:
 9d5d496c3464b7ad0ba942b4ada5f27c07e07079 h: refs/heads/master i:   321469:
 5810aeb9bc2eb14430c87e9b826b2602284cc575   321467:
 2c1e6f86925b5a8d91946565e10ed922f8b2db25   321463:
 36b10f73d02b74e4c2f8769d2ef8a76dd9975695   321455:
 d2c2ae51ee0d6654eb125fca80ef0babf9c205dc   321439:
 74c2f87194c39c0ce325c89a5317834f6714a5bb   321407:
 d64cd9f082e66c25ac083a958662175a5c389434 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wireless/libertas/main.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c1fc85ac5c5..643e822524e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 828afd26fe78f87d0bd1dfce64c561f78c1a8969
+refs/heads/master: 9d5d496c3464b7ad0ba942b4ada5f27c07e07079
diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
index 58048189bd24..fe1ea43c5149 100644
--- a/trunk/drivers/net/wireless/libertas/main.c
+++ b/trunk/drivers/net/wireless/libertas/main.c
@@ -571,7 +571,10 @@ static int lbs_thread(void *data)
 			netdev_info(dev, "Timeout submitting command 0x%04x\n",
 				    le16_to_cpu(cmdnode->cmdbuf->command));
 			lbs_complete_command(priv, cmdnode, -ETIMEDOUT);
-			if (priv->reset_card)
+
+			/* Reset card, but only when it isn't in the process
+			 * of being shutdown anyway. */
+			if (!dev->dismantle && priv->reset_card)
 				priv->reset_card(priv);
 		}
 		priv->cmd_timed_out = 0;