Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] orinoco: simplify locking, fix error handling in PCMCIA resume

Browse Source 
Don't use flags in the spinlocks - the PCMCIA resume functions may not
be called under lock.  Don't ignore any errors.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Roskin 2006-05-01 02:13:28 -04:00 committed by John W. Linville
parent 9a568da209
commit 6cbaa330f1
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/orinoco_cs.c
View File

@ -415,7 +415,6 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
struct orinoco_pccard *card = priv->card; struct orinoco_pccard *card = priv->card;
int err = 0; int err = 0;
unsigned long flags;
if (! test_bit(0, &card->hard_reset_in_progress)) { if (! test_bit(0, &card->hard_reset_in_progress)) {
err = orinoco_reinit_firmware(dev); err = orinoco_reinit_firmware(dev);
@ -425,7 +424,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
return -EIO; return -EIO;
} }
spin_lock_irqsave(&priv->lock, flags); spin_lock(&priv->lock);
netif_device_attach(dev); netif_device_attach(dev);
priv->hw_unavailable--; priv->hw_unavailable--;
@ -437,10 +436,10 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
dev->name, err); dev->name, err);
} }
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock(&priv->lock);
} }
return 0; return err;
} }

7
drivers/net/wireless/spectrum_cs.c
View File

@ -866,11 +866,10 @@ spectrum_cs_suspend(struct pcmcia_device *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
unsigned long flags;
int err = 0; int err = 0;
/* Mark the device as stopped, to block IO until later */ /* Mark the device as stopped, to block IO until later */
spin_lock_irqsave(&priv->lock, flags); spin_lock(&priv->lock);
err = __orinoco_down(dev); err = __orinoco_down(dev);
if (err) if (err)
@ -880,9 +879,9 @@ spectrum_cs_suspend(struct pcmcia_device *link)
netif_device_detach(dev); netif_device_detach(dev);
priv->hw_unavailable++; priv->hw_unavailable++;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock(&priv->lock);
return 0; return err;
} }
static int static int