Skip to content

Commit

Permalink
orinoco: fix unsafe locking in spectrum_cs_suspend
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Kilroy authored and John W. Linville committed Oct 15, 2008
1 parent 552a715 commit c25bab5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/net/wireless/spectrum_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
}
Expand Down

0 comments on commit c25bab5

Please sign in to comment.