diff options
| author | David Kilroy <kilroyd@googlemail.com> | 2008-10-10 22:58:32 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-10-14 21:08:11 -0400 |
| commit | c25bab54fe30d26a2cddf7058d77da72be630b23 (patch) | |
| tree | 03a7f6af7176fbeb85d2839903922c132acdf61e | |
| parent | 552a71515eef5cba9af8bfe608149557059c4463 (diff) | |
| download | linux-c25bab54fe30d26a2cddf7058d77da72be630b23.tar.gz linux-c25bab54fe30d26a2cddf7058d77da72be630b23.tar.bz2 linux-c25bab54fe30d26a2cddf7058d77da72be630b23.zip | |
orinoco: fix unsafe locking in spectrum_cs_suspend
A similar problem was highlighted in the orinoco_cs driver by lockdep.
This patch fixes the spectrum_cs driver.
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/spectrum_cs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c index 67b26d3c3cd5..f5513cd4db35 100644 --- a/drivers/net/wireless/spectrum_cs.c +++ b/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; } |