diff options
Diffstat (limited to 'sound/pcmcia/pdaudiocf/pdaudiocf.c')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 64b859925c0b..7717e01fc071 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
@@ -131,7 +131,7 @@ static int snd_pdacf_probe(struct pcmcia_device *link) | |||
131 | return err; | 131 | return err; |
132 | } | 132 | } |
133 | 133 | ||
134 | snd_card_set_dev(card, &handle_to_dev(link)); | 134 | snd_card_set_dev(card, &link->dev); |
135 | 135 | ||
136 | pdacf->index = i; | 136 | pdacf->index = i; |
137 | card_list[i] = card; | 137 | card_list[i] = card; |
@@ -142,12 +142,10 @@ static int snd_pdacf_probe(struct pcmcia_device *link) | |||
142 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 142 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
143 | link->io.NumPorts1 = 16; | 143 | link->io.NumPorts1 = 16; |
144 | 144 | ||
145 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT | IRQ_FORCED_PULSE; | 145 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE; |
146 | // link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 146 | // link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; |
147 | 147 | ||
148 | link->irq.IRQInfo1 = 0 /* | IRQ_LEVEL_ID */; | ||
149 | link->irq.Handler = pdacf_interrupt; | 148 | link->irq.Handler = pdacf_interrupt; |
150 | link->irq.Instance = pdacf; | ||
151 | link->conf.Attributes = CONF_ENABLE_IRQ; | 149 | link->conf.Attributes = CONF_ENABLE_IRQ; |
152 | link->conf.IntType = INT_MEMORY_AND_IO; | 150 | link->conf.IntType = INT_MEMORY_AND_IO; |
153 | link->conf.ConfigIndex = 1; | 151 | link->conf.ConfigIndex = 1; |