diff options
| author | Ken Kawasaki <ken_kawasaki@spring.nifty.jp> | 2009-12-12 14:44:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-13 19:47:43 -0800 |
| commit | 671c8806c25d06407e348690c09d7c37521eda32 (patch) | |
| tree | dac56b7f12e713ad149c35f7d1e1a866c627b1d7 /drivers/net | |
| parent | e0802793f6f65242760089d8d85a50098706dd26 (diff) | |
| download | blackbird-op-linux-671c8806c25d06407e348690c09d7c37521eda32.tar.gz blackbird-op-linux-671c8806c25d06407e348690c09d7c37521eda32.zip | |
3c574_cs: disable irq before calling el3_interrupt
3c574_cs, 3c589_cs:
disable irq before calling el3_interrupt
in the media_check function.
Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 4 | ||||
| -rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 17a27225cc98..98938ea9e0bd 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c @@ -912,7 +912,11 @@ static void media_check(unsigned long arg) if ((inw(ioaddr + EL3_STATUS) & IntLatch) && (inb(ioaddr + Timer) == 0xff)) { if (!lp->fast_poll) printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); + + local_irq_save(flags); el3_interrupt(dev->irq, dev); + local_irq_restore(flags); + lp->fast_poll = HZ; } if (lp->fast_poll) { diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 6f8d7e2e5922..322e11df0097 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c @@ -711,7 +711,11 @@ static void media_check(unsigned long arg) (inb(ioaddr + EL3_TIMER) == 0xff)) { if (!lp->fast_poll) printk(KERN_WARNING "%s: interrupt(s) dropped!\n", dev->name); + + local_irq_save(flags); el3_interrupt(dev->irq, dev); + local_irq_restore(flags); + lp->fast_poll = HZ; } if (lp->fast_poll) { |
