Commit 688956f2 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Fix races in irq handler and ioremap 



Call ioremap before request_irq for avoiding possible races
in the irq handler.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c5533bf3

sound/pci/cs4281.c

+7 −7
Original line number Diff line number Diff line
@@ -1379,20 +1379,20 @@ static int __devinit snd_cs4281_create(struct snd_card *card, 
	chip->ba0_addr = pci_resource_start(pci, 0);

	chip->ba1_addr = pci_resource_start(pci, 1);



	if (request_irq(pci->irq, snd_cs4281_interrupt, SA_INTERRUPT|SA_SHIRQ,

			"CS4281", chip)) {

		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);

	chip->ba0 = ioremap_nocache(chip->ba0_addr, pci_resource_len(pci, 0));

	chip->ba1 = ioremap_nocache(chip->ba1_addr, pci_resource_len(pci, 1));

	if (!chip->ba0 || !chip->ba1) {

		snd_cs4281_free(chip);

		return -ENOMEM;

	}

	chip->irq = pci->irq;

	

	chip->ba0 = ioremap_nocache(chip->ba0_addr, pci_resource_len(pci, 0));

	chip->ba1 = ioremap_nocache(chip->ba1_addr, pci_resource_len(pci, 1));

	if (!chip->ba0 || !chip->ba1) {

	if (request_irq(pci->irq, snd_cs4281_interrupt, SA_INTERRUPT|SA_SHIRQ,

			"CS4281", chip)) {

		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);

		snd_cs4281_free(chip);

		return -ENOMEM;

	}

	chip->irq = pci->irq;



	tmp = snd_cs4281_chip_init(chip);

	if (tmp) {

sound/pci/rme32.c

+6 −6
Original line number Diff line number Diff line
@@ -1368,18 +1368,18 @@ static int __devinit snd_rme32_create(struct rme32 * rme32) 
		return err;

	rme32->port = pci_resource_start(rme32->pci, 0);



	if (request_irq(pci->irq, snd_rme32_interrupt, SA_INTERRUPT | SA_SHIRQ, "RME32", (void *) rme32)) {

		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);

		return -EBUSY;

	}

	rme32->irq = pci->irq;



	if ((rme32->iobase = ioremap_nocache(rme32->port, RME32_IO_SIZE)) == 0) {

		snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n",

			   rme32->port, rme32->port + RME32_IO_SIZE - 1);

		return -ENOMEM;

	}



	if (request_irq(pci->irq, snd_rme32_interrupt, SA_INTERRUPT | SA_SHIRQ, "RME32", (void *) rme32)) {

		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);

		return -EBUSY;

	}

	rme32->irq = pci->irq;



	/* read the card's revision number */

	pci_read_config_byte(pci, 8, &rme32->rev);

sound/pci/rme96.c

+5 −5
Original line number Diff line number Diff line
@@ -1583,17 +1583,17 @@ snd_rme96_create(struct rme96 *rme96) 
		return err;

	rme96->port = pci_resource_start(rme96->pci, 0);



	if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) {

		snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1);

		return -ENOMEM;

	}



	if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) {

		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);

		return -EBUSY;

	}

	rme96->irq = pci->irq;



	if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) {

		snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1);

		return -ENOMEM;

	}



	/* read the card's revision number */

	pci_read_config_byte(pci, 8, &rme96->rev);