pcnet_cs, axnet_cs: clear bogus interrupt before request_irq
Signed-off-by: Komuro <komurojun-mbn@nifty.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
52cc30862a
commit
54299ef7e9
2 changed files with 5 additions and 0 deletions
|
@ -525,12 +525,14 @@ static int axnet_open(struct net_device *dev)
|
||||||
int ret;
|
int ret;
|
||||||
axnet_dev_t *info = PRIV(dev);
|
axnet_dev_t *info = PRIV(dev);
|
||||||
struct pcmcia_device *link = info->p_dev;
|
struct pcmcia_device *link = info->p_dev;
|
||||||
|
unsigned int nic_base = dev->base_addr;
|
||||||
|
|
||||||
DEBUG(2, "axnet_open('%s')\n", dev->name);
|
DEBUG(2, "axnet_open('%s')\n", dev->name);
|
||||||
|
|
||||||
if (!pcmcia_dev_present(link))
|
if (!pcmcia_dev_present(link))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
outb_p(0xFF, nic_base + EN0_ISR); /* Clear bogus intr. */
|
||||||
ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, "axnet_cs", dev);
|
ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, "axnet_cs", dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -969,6 +969,7 @@ static int pcnet_open(struct net_device *dev)
|
||||||
int ret;
|
int ret;
|
||||||
pcnet_dev_t *info = PRIV(dev);
|
pcnet_dev_t *info = PRIV(dev);
|
||||||
struct pcmcia_device *link = info->p_dev;
|
struct pcmcia_device *link = info->p_dev;
|
||||||
|
unsigned int nic_base = dev->base_addr;
|
||||||
|
|
||||||
DEBUG(2, "pcnet_open('%s')\n", dev->name);
|
DEBUG(2, "pcnet_open('%s')\n", dev->name);
|
||||||
|
|
||||||
|
@ -976,6 +977,8 @@ static int pcnet_open(struct net_device *dev)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
set_misc_reg(dev);
|
set_misc_reg(dev);
|
||||||
|
|
||||||
|
outb_p(0xFF, nic_base + EN0_ISR); /* Clear bogus intr. */
|
||||||
ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev_info, dev);
|
ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev_info, dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Add table
Reference in a new issue