diff options
author | David S. Miller <davem@davemloft.net> | 2008-10-14 23:19:16 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-14 23:19:16 -0700 |
commit | ab55570d64d5409fa940e85dd8de2594b160f826 (patch) | |
tree | 4010f080f2631e046ee4b5dcb29c8df2cfb9ee7e /drivers/net/wireless/orinoco_cs.c | |
parent | eef9d90dcde7bb4d029b67ed36457efc4970d5a2 (diff) | |
parent | 8713a7ccd88d93d9f8a72436088d6627c82490db (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/orinoco_cs.c')
-rw-r--r-- | drivers/net/wireless/orinoco_cs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c index 9eaa252c243..65fd054e017 100644 --- a/drivers/net/wireless/orinoco_cs.c +++ b/drivers/net/wireless/orinoco_cs.c @@ -403,6 +403,7 @@ 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); @@ -412,7 +413,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link) return -EIO; } - spin_lock(&priv->lock); + spin_lock_irqsave(&priv->lock, flags); netif_device_attach(dev); priv->hw_unavailable--; @@ -424,7 +425,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link) dev->name, err); } - spin_unlock(&priv->lock); + spin_unlock_irqrestore(&priv->lock, flags); } return err; |