diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-07 10:58:29 +0100 | 
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-05-10 10:23:12 +0200 | 
| commit | a7debe789dfcaee9c4d81e5738b0be8c5d93930b (patch) | |
| tree | 669288850cb74591fc95f4de0cb98121e399ae09 /sound/pcmcia | |
| parent | 6f840afb416748c15cf55c19b45c4870554c3af1 (diff) | |
| download | linux-a7debe789dfcaee9c4d81e5738b0be8c5d93930b.tar.bz2 | |
pcmcia: pass FORCED_PULSE parameter in pcmcia_request_configuration()
As it's only used there it makes no sense relying on pcmcia_request_irq().
CC: alsa-devel@alsa-project.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'sound/pcmcia')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index edaa729126bb..dcf85390c5f9 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c @@ -142,12 +142,12 @@ static int snd_pdacf_probe(struct pcmcia_device *link)  	link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;  	link->io.NumPorts1 = 16; -	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE; +	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;  	/* FIXME: This driver should be updated to allow for dynamic IRQ sharing */ -	/* link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE; */ +	/* link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; */  	link->irq.Handler = pdacf_interrupt; -	link->conf.Attributes = CONF_ENABLE_IRQ; +	link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;  	link->conf.IntType = INT_MEMORY_AND_IO;  	link->conf.ConfigIndex = 1;  	link->conf.Present = PRESENT_OPTION;  |