diff options
| author | Michael Buesch <mb@bu3sch.de> | 2008-03-28 11:48:53 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-04-01 15:44:08 -0400 |
| commit | e645890115004fa6c4dd1f9541bb834970c8bcae (patch) | |
| tree | 1bcba4ab52aa3e4b8c59a980110c16fe2cd997f0 /drivers/net | |
| parent | 539e6f8cffe9299fbf813ad574535b90ac370031 (diff) | |
| download | blackbird-op-linux-e645890115004fa6c4dd1f9541bb834970c8bcae.tar.gz blackbird-op-linux-e645890115004fa6c4dd1f9541bb834970c8bcae.zip | |
b43: Fix PCMCIA IRQ routing
This fixes the IRQ routing on PCMCIA devices.
With this patch the card will finally be able to receive IRQs.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/b43/pcmcia.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index b79a6bd5396d..371e4a119511 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c @@ -91,6 +91,8 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) dev->conf.ConfigBase = parse.config.base; dev->conf.Present = parse.config.rmask[0]; + dev->conf.Attributes = CONF_ENABLE_IRQ; + dev->conf.IntType = INT_MEMORY_AND_IO; dev->io.BasePort2 = 0; dev->io.NumPorts2 = 0; @@ -112,8 +114,8 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) if (res != CS_SUCCESS) goto err_disable; - dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FIRST_SHARED; - dev->irq.IRQInfo1 = IRQ_LEVEL_ID | IRQ_SHARE_ID; + dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; + dev->irq.IRQInfo1 = IRQ_LEVEL_ID; dev->irq.Handler = NULL; /* The handler is registered later. */ dev->irq.Instance = NULL; res = pcmcia_request_irq(dev, &dev->irq); |
