---

yaml
---
r: 122335
b: refs/heads/master
c: ac7cafd
h: refs/heads/master
i:
  122333: b984c17
  122331: 2e1a2ac
  122327: 38f762d
  122319: d78ea90
  122303: 656b833
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cea7b261942009e90befbe41d998e2931547026
+refs/heads/master: ac7cafd72261857278dff9f737e600b30088653b

trunk/drivers/net/wireless/orinoco/spectrum_cs.c

@@ -450,10 +450,29 @@ spectrum_cs_resume(struct pcmcia_device *link)
 {
 	struct net_device *dev = link->priv;
 	struct orinoco_private *priv = netdev_priv(dev);
+	unsigned long flags;
+	int err;
+
+	err = orinoco_reinit_firmware(dev);
+	if (err) {
+		printk(KERN_ERR "%s: Error %d re-initializing firmware\n",
+		       dev->name, err);
+		return -EIO;
+	}
+
+	spin_lock_irqsave(&priv->lock, flags);
 
 	netif_device_attach(dev);
 	priv->hw_unavailable--;
-	schedule_work(&priv->reset_work);
+
+	if (priv->open && !priv->hw_unavailable) {
+		err = __orinoco_up(dev);
+		if (err)
+			printk(KERN_ERR "%s: Error %d restarting card\n",
+			       dev->name, err);
+	}
+
+	spin_unlock_irqrestore(&priv->lock, flags);
 
 	return 0;
 }