From 2eda2b4b0fecc92ea3edd69e6568fb8b5dddc7ce Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Fri, 10 Oct 2008 22:58:32 +0100 Subject: [PATCH] --- yaml --- r: 115027 b: refs/heads/master c: c25bab54fe30d26a2cddf7058d77da72be630b23 h: refs/heads/master i: 115025: fa186df98b77921a51983848549a7967aecc0561 115023: bfe726b99016aebe7ae1bb3a797c664dc45e13ca v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/spectrum_cs.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c9a50d9b61ec..b9b57bb466d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 552a71515eef5cba9af8bfe608149557059c4463 +refs/heads/master: c25bab54fe30d26a2cddf7058d77da72be630b23 diff --git a/trunk/drivers/net/wireless/spectrum_cs.c b/trunk/drivers/net/wireless/spectrum_cs.c index 67b26d3c3cd5..f5513cd4db35 100644 --- a/trunk/drivers/net/wireless/spectrum_cs.c +++ b/trunk/drivers/net/wireless/spectrum_cs.c @@ -450,10 +450,11 @@ spectrum_cs_suspend(struct pcmcia_device *link) { struct net_device *dev = link->priv; struct orinoco_private *priv = netdev_priv(dev); + unsigned long flags; int err = 0; /* Mark the device as stopped, to block IO until later */ - spin_lock(&priv->lock); + spin_lock_irqsave(&priv->lock, flags); err = __orinoco_down(dev); if (err) @@ -463,7 +464,7 @@ spectrum_cs_suspend(struct pcmcia_device *link) netif_device_detach(dev); priv->hw_unavailable++; - spin_unlock(&priv->lock); + spin_unlock_irqrestore(&priv->lock, flags); return err; }