From 40a3e32880fb81bea4bf128ee5846285d63341af Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Wed, 7 Nov 2007 19:08:26 +0100 Subject: [PATCH] --- yaml --- r: 73456 b: refs/heads/master c: 9dcb5f477ffa757b7f1817da557905ccae17fc37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/pcmcia.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c8b00b02e886..25085007847d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 440cb58a7aa979fabb02a38e55bfe93adde0f41c +refs/heads/master: 9dcb5f477ffa757b7f1817da557905ccae17fc37 diff --git a/trunk/drivers/net/wireless/b43/pcmcia.c b/trunk/drivers/net/wireless/b43/pcmcia.c index 4b6648f0efcd..b79a6bd5396d 100644 --- a/trunk/drivers/net/wireless/b43/pcmcia.c +++ b/trunk/drivers/net/wireless/b43/pcmcia.c @@ -112,6 +112,14 @@ 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.Handler = NULL; /* The handler is registered later. */ + dev->irq.Instance = NULL; + res = pcmcia_request_irq(dev, &dev->irq); + if (res != CS_SUCCESS) + goto err_disable; + res = pcmcia_request_configuration(dev, &dev->conf); if (res != CS_SUCCESS) goto err_disable;