diff options
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 58048189bd2..fe1ea43c514 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/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;  |