|
@@ -415,7 +415,6 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
|
|
|
struct orinoco_private *priv = netdev_priv(dev);
|
|
|
struct orinoco_pccard *card = priv->card;
|
|
|
int err = 0;
|
|
|
- unsigned long flags;
|
|
|
|
|
|
if (! test_bit(0, &card->hard_reset_in_progress)) {
|
|
|
err = orinoco_reinit_firmware(dev);
|
|
@@ -425,7 +424,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
|
|
|
return -EIO;
|
|
|
}
|
|
|
|
|
|
- spin_lock_irqsave(&priv->lock, flags);
|
|
|
+ spin_lock(&priv->lock);
|
|
|
|
|
|
netif_device_attach(dev);
|
|
|
priv->hw_unavailable--;
|
|
@@ -437,10 +436,10 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
|
|
|
dev->name, err);
|
|
|
}
|
|
|
|
|
|
- spin_unlock_irqrestore(&priv->lock, flags);
|
|
|
+ spin_unlock(&priv->lock);
|
|
|
}
|
|
|
|
|
|
- return 0;
|
|
|
+ return err;
|
|
|
}
|
|
|
|
|
|
|