mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 21:54:06 +08:00
orinoco: fix unsafe locking in orinoco_cs_resume
[ 6972.562035] ================================= [ 6972.562040] [ INFO: inconsistent lock state ] [ 6972.562048] 2.6.27-1avb #17 [ 6972.562053] --------------------------------- [ 6972.562060] inconsistent {in-hardirq-W} -> {hardirq-on-W} usage. [ 6972.562068] pm-suspend/17062 [HC0[0]:SC0[0]:HE1:SE1] takes: [ 6972.562076] (&priv->lock){++..}, at: [<dfd4f05b>] orinoco_cs_resume+0x5b/0xd0 [orinoco_cs] [ 6972.562122] {in-hardirq-W} state was registered at: [ 6972.562128] [<c013ea6b>] __lock_acquire+0x6cb/0x1640 [ 6972.562171] [<c013fa3c>] lock_acquire+0x5c/0x80 [ 6972.562181] [<c02f6e39>] _spin_lock_irqsave+0x49/0x80 [ 6972.562210] [<dfd6425d>] orinoco_interrupt+0x4d/0x16d0 [orinoco] [ 6972.562257] [<c015a2b1>] handle_IRQ_event+0x31/0x60 [ 6972.562278] [<c015b73e>] handle_level_irq+0x6e/0xe0 [ 6972.562291] [<c0104b20>] do_IRQ+0xb0/0x130 [ 6972.562313] [<ffffffff>] 0xffffffff Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
33c0360bf7
commit
552a71515e
@ -403,6 +403,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
|
||||
struct orinoco_private *priv = netdev_priv(dev);
|
||||
struct orinoco_pccard *card = priv->card;
|
||||
int err = 0;
|
||||
unsigned long flags;
|
||||
|
||||
if (! test_bit(0, &card->hard_reset_in_progress)) {
|
||||
err = orinoco_reinit_firmware(dev);
|
||||
@ -412,7 +413,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
spin_lock(&priv->lock);
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
|
||||
netif_device_attach(dev);
|
||||
priv->hw_unavailable--;
|
||||
@ -424,7 +425,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
|
||||
dev->name, err);
|
||||
}
|
||||
|
||||
spin_unlock(&priv->lock);
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
}
|
||||
|
||||
return err;
|
||||
|
Loading…
Reference in New Issue
Block a user