---

yaml --- r: 321471 b: refs/heads/master c: 9d5d496 h: refs/heads/master i: 321469: 5810aeb 321467: 2c1e6f8 321463: 36b10f7 321455: d2c2ae5 321439: 74c2f87 321407: d64cd9f v: v3
git-mirror · Aug 2, 2012 · e6c015b · e6c015b
1 parent 5943c9b
commit e6c015b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;