Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6458901 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

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: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 539e6f8c

drivers/net/wireless/b43/pcmcia.c

+4 −2
Original line number Diff line number Diff line
@@ -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);