Commit 671c8806 authored by Ken Kawasaki's avatar Ken Kawasaki Committed by David S. Miller

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: default avatarKen Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0802793
...@@ -912,7 +912,11 @@ static void media_check(unsigned long arg) ...@@ -912,7 +912,11 @@ static void media_check(unsigned long arg)
if ((inw(ioaddr + EL3_STATUS) & IntLatch) && (inb(ioaddr + Timer) == 0xff)) { if ((inw(ioaddr + EL3_STATUS) & IntLatch) && (inb(ioaddr + Timer) == 0xff)) {
if (!lp->fast_poll) if (!lp->fast_poll)
printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name);
local_irq_save(flags);
el3_interrupt(dev->irq, dev); el3_interrupt(dev->irq, dev);
local_irq_restore(flags);
lp->fast_poll = HZ; lp->fast_poll = HZ;
} }
if (lp->fast_poll) { if (lp->fast_poll) {
......
...@@ -711,7 +711,11 @@ static void media_check(unsigned long arg) ...@@ -711,7 +711,11 @@ static void media_check(unsigned long arg)
(inb(ioaddr + EL3_TIMER) == 0xff)) { (inb(ioaddr + EL3_TIMER) == 0xff)) {
if (!lp->fast_poll) if (!lp->fast_poll)
printk(KERN_WARNING "%s: interrupt(s) dropped!\n", dev->name); printk(KERN_WARNING "%s: interrupt(s) dropped!\n", dev->name);
local_irq_save(flags);
el3_interrupt(dev->irq, dev); el3_interrupt(dev->irq, dev);
local_irq_restore(flags);
lp->fast_poll = HZ; lp->fast_poll = HZ;
} }
if (lp->fast_poll) { if (lp->fast_poll) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment