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

Commit 3d1c2884 authored by Frank Mori Hess's avatar Frank Mori Hess Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: pcmcia irq fixes 



Replaced IRQ_TYPE_EXCLUSIVE with IRQ_TYPE_DYNAMIC_SHARING for pcmcia
drivers.

Signed-off-by: default avatarFrank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ecb8486d

drivers/staging/comedi/drivers/cb_das16_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link) 


	/* Initialize the pcmcia_device structure */

	/* Interrupt setup */

	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;

	link->irq.IRQInfo1 = IRQ_LEVEL_ID;

	link->irq.Handler = NULL;

drivers/staging/comedi/drivers/ni_daq_700.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static int dio700_cs_attach(struct pcmcia_device *link) 
	link->priv = local;



	/* Interrupt setup */

	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;

	link->irq.IRQInfo1 = IRQ_LEVEL_ID;

	link->irq.Handler = NULL;

drivers/staging/comedi/drivers/ni_daq_dio24.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static int dio24_cs_attach(struct pcmcia_device *link) 
	link->priv = local;



	/* Interrupt setup */

	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;

	link->irq.IRQInfo1 = IRQ_LEVEL_ID;

	link->irq.Handler = NULL;

drivers/staging/comedi/drivers/ni_labpc_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int labpc_cs_attach(struct pcmcia_device *link) 
	link->priv = local;



	/* Interrupt setup */

	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE;

	link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_PULSE_ID;

	link->irq.Handler = NULL;

drivers/staging/comedi/drivers/ni_mio_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int cs_attach(struct pcmcia_device *link) 
{

	link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;

	link->io.NumPorts1 = 16;

	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;

	link->irq.IRQInfo1 = IRQ_LEVEL_ID;

	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.IntType = INT_MEMORY_AND_IO;