Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c25bab54 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

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: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 552a7151

drivers/net/wireless/spectrum_cs.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

}