diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-06-06 09:44:34 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 15:34:13 -0400 |
commit | 688956f23bdbfb1c3551bfafc819f989b36bb8ae (patch) | |
tree | ae59fdf7662b5a27c66554cbfd2b67c49fc156da /sound/pci/rme96.c | |
parent | c5533bf36b4a6629dab0e08c4951247050928853 (diff) |
[ALSA] Fix races in irq handler and ioremap
Call ioremap before request_irq for avoiding possible races
in the irq handler.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/rme96.c')
-rw-r--r-- | sound/pci/rme96.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index 65611a7d366d..991cb18c14f3 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
@@ -1583,17 +1583,17 @@ snd_rme96_create(struct rme96 *rme96) | |||
1583 | return err; | 1583 | return err; |
1584 | rme96->port = pci_resource_start(rme96->pci, 0); | 1584 | rme96->port = pci_resource_start(rme96->pci, 0); |
1585 | 1585 | ||
1586 | if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) { | ||
1587 | snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1); | ||
1588 | return -ENOMEM; | ||
1589 | } | ||
1590 | |||
1586 | if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) { | 1591 | if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) { |
1587 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1592 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1588 | return -EBUSY; | 1593 | return -EBUSY; |
1589 | } | 1594 | } |
1590 | rme96->irq = pci->irq; | 1595 | rme96->irq = pci->irq; |
1591 | 1596 | ||
1592 | if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) { | ||
1593 | snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1); | ||
1594 | return -ENOMEM; | ||
1595 | } | ||
1596 | |||
1597 | /* read the card's revision number */ | 1597 | /* read the card's revision number */ |
1598 | pci_read_config_byte(pci, 8, &rme96->rev); | 1598 | pci_read_config_byte(pci, 8, &rme96->rev); |
1599 | 1599 | ||