diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-06-01 05:42:14 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 15:34:07 -0400 |
commit | f079c25ab8a7d223875c5bac9b23b484e4a18f88 (patch) | |
tree | de5d3fbad8b2f9f7ff8b66410ab7eb7a96e63167 /sound/pci | |
parent | 29463dfea754b8b360f638244f002c751aaad1b0 (diff) |
[ALSA] hda-intel - Fix race in remove
Call iounmap after free_irq to avoid invalid accesses in the
shared irq. The patch is taken from
https://bugzilla.novell.com/show_bug.cgi?id=167869
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 0154389bf95b..4070b5cd9b6b 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -1402,10 +1402,10 @@ static int azx_free(struct azx *chip) | |||
1402 | msleep(1); | 1402 | msleep(1); |
1403 | } | 1403 | } |
1404 | 1404 | ||
1405 | if (chip->remap_addr) | ||
1406 | iounmap(chip->remap_addr); | ||
1407 | if (chip->irq >= 0) | 1405 | if (chip->irq >= 0) |
1408 | free_irq(chip->irq, (void*)chip); | 1406 | free_irq(chip->irq, (void*)chip); |
1407 | if (chip->remap_addr) | ||
1408 | iounmap(chip->remap_addr); | ||
1409 | 1409 | ||
1410 | if (chip->bdl.area) | 1410 | if (chip->bdl.area) |
1411 | snd_dma_free_pages(&chip->bdl); | 1411 | snd_dma_free_pages(&chip->bdl); |