diff options
author | Michael Buesch <mb@bu3sch.de> | 2007-11-07 13:08:26 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-11-10 04:25:13 -0500 |
commit | 9dcb5f477ffa757b7f1817da557905ccae17fc37 (patch) | |
tree | 6a8cfe723482d29e9be8cd958893d928feee7950 | |
parent | 440cb58a7aa979fabb02a38e55bfe93adde0f41c (diff) |
b43: properly request pcmcia IRQ
PCMCIA needs an additional step to request the IRQ.
No need to add code to release the IRQ here, as that's done
automatically in pcmcia_disable_device().
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/b43/pcmcia.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index 4b6648f0efcd..b79a6bd5396d 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c | |||
@@ -112,6 +112,14 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) | |||
112 | if (res != CS_SUCCESS) | 112 | if (res != CS_SUCCESS) |
113 | goto err_disable; | 113 | goto err_disable; |
114 | 114 | ||
115 | dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FIRST_SHARED; | ||
116 | dev->irq.IRQInfo1 = IRQ_LEVEL_ID | IRQ_SHARE_ID; | ||
117 | dev->irq.Handler = NULL; /* The handler is registered later. */ | ||
118 | dev->irq.Instance = NULL; | ||
119 | res = pcmcia_request_irq(dev, &dev->irq); | ||
120 | if (res != CS_SUCCESS) | ||
121 | goto err_disable; | ||
122 | |||
115 | res = pcmcia_request_configuration(dev, &dev->conf); | 123 | res = pcmcia_request_configuration(dev, &dev->conf); |
116 | if (res != CS_SUCCESS) | 124 | if (res != CS_SUCCESS) |
117 | goto err_disable; | 125 | goto err_disable; |