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

Commit 86f91d36 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] i810_audio: request_irq() fix 



Request the IRQ after having set everything up.  Otherwise a shared interrupt
at the right time can kill the machine.

Found this with David Woodhouse <dwmw2@infradead.org>'s
debug-shared-irqs.patch.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 96e9dd14

sound/oss/i810_audio.c

+8 −10
Original line number Diff line number Diff line
@@ -3359,12 +3359,6 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device 
		goto out_region2;

	}



	if (request_irq(card->irq, &i810_interrupt, SA_SHIRQ,

			card_names[pci_id->driver_data], card)) {

		printk(KERN_ERR "i810_audio: unable to allocate irq %d\n", card->irq);

		goto out_pio;

	}



	if (card->use_mmio) {

		if (request_mem_region(card->ac97base_mmio_phys, 512, "ich_audio MMBAR")) {

			if ((card->ac97base_mmio = ioremap(card->ac97base_mmio_phys, 512))) { /*@FIXME can ioremap fail? don't know (jsaw) */
@@ -3395,10 +3389,8 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device 
	}



	/* initialize AC97 codec and register /dev/mixer */

	if (i810_ac97_init(card) <= 0) {

		free_irq(card->irq, card);

	if (i810_ac97_init(card) <= 0)

		goto out_iospace;

	}

	pci_set_drvdata(pci_dev, card);



	if(clocking == 0) {
@@ -3410,7 +3402,6 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device 
	if ((card->dev_audio = register_sound_dsp(&i810_audio_fops, -1)) < 0) {

		int i;

		printk(KERN_ERR "i810_audio: couldn't register DSP device!\n");

		free_irq(card->irq, card);

		for (i = 0; i < NR_AC97; i++)

		if (card->ac97_codec[i] != NULL) {

			unregister_sound_mixer(card->ac97_codec[i]->dev_mixer);
@@ -3419,6 +3410,13 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device 
		goto out_iospace;

	}



	if (request_irq(card->irq, &i810_interrupt, SA_SHIRQ,

			card_names[pci_id->driver_data], card)) {

		printk(KERN_ERR "i810_audio: unable to allocate irq %d\n", card->irq);

		goto out_iospace;

	}





 	card->initializing = 0;

	return 0;