diff options
| author | Andres Salomon <dilinger@debian.org> | 2008-06-25 16:51:01 -0400 |
|---|---|---|
| committer | Andres Salomon <dilinger@debian.org> | 2008-06-25 16:51:01 -0400 |
| commit | 744e740861edba96bcfde669de0466fb51f05def (patch) | |
| tree | faa39413dd8e4603f352e88df65f178bce64f5d5 /sound | |
| parent | f7ee4ccc273a13af43ca3de88da55a2b5ebb3c6e (diff) | |
| parent | 3ad3367cdc36ff6ce4efd2159c39923a2b334f94 (diff) | |
| download | lwn-744e740861edba96bcfde669de0466fb51f05def.tar.gz lwn-744e740861edba96bcfde669de0466fb51f05def.zip | |
Merge branch '2.6.25.y' into testing
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 15 | ||||
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 1 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 9a9b977d3cf1..d0330d8ea095 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1817,13 +1817,6 @@ int __devinit snd_emu10k1_create(struct snd_card *card, } emu->port = pci_resource_start(pci, 0); - if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED, - "EMU10K1", emu)) { - err = -EBUSY; - goto error; - } - emu->irq = pci->irq; - emu->max_cache_pages = max_cache_bytes >> PAGE_SHIFT; if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), 32 * 1024, &emu->ptb_pages) < 0) { @@ -1886,6 +1879,14 @@ int __devinit snd_emu10k1_create(struct snd_card *card, emu->fx8010.etram_pages.area = NULL; emu->fx8010.etram_pages.bytes = 0; + /* irq handler must be registered after I/O ports are activated */ + if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED, + "EMU10K1", emu)) { + err = -EBUSY; + goto error; + } + emu->irq = pci->irq; + /* * Init to 0x02109204 : * Clock accuracy = 0 (1000ppm) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 33282f9c01c7..52a7f0f07dba 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -940,7 +940,6 @@ do_sku: AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT); spec->unsol_event = alc_sku_unsol_event; - spec->init_hook = alc_sku_automute; } /* |