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

Commit 330bcd2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  sound: emu10k1 - fix system hang with Audigy2 ZS Notebook PCMCIA card
parents 156a9ea4 868e15db

sound/pci/emu10k1/emu10k1_main.c

+8 −7
Original line number Diff line number Diff line
@@ -1818,13 +1818,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) {
@@ -1887,6 +1880,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)