Skip to content

Commit

Permalink
[ALSA] Fix possible races in PCI driver removal
Browse files Browse the repository at this point in the history
Call free_irq() before releasing others to avoid races when
shared irq is issued.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jun 22, 2006
1 parent f079c25 commit 0a50d2b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions sound/pci/cs46xx/cs46xx_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -2877,14 +2877,15 @@ static int snd_cs46xx_free(struct snd_cs46xx *chip)
if (chip->region.idx[0].resource)
snd_cs46xx_hw_stop(chip);

if (chip->irq >= 0)
free_irq(chip->irq, chip);

for (idx = 0; idx < 5; idx++) {
struct snd_cs46xx_region *region = &chip->region.idx[idx];
if (region->remap_addr)
iounmap(region->remap_addr);
release_and_free_resource(region->resource);
}
if (chip->irq >= 0)
free_irq(chip->irq, chip);

if (chip->active_ctrl)
chip->active_ctrl(chip, -chip->amplifier);
Expand Down
4 changes: 2 additions & 2 deletions sound/pci/riptide/riptide.c
Original file line number Diff line number Diff line change
Expand Up @@ -1836,11 +1836,11 @@ static int snd_riptide_free(struct snd_riptide *chip)
UNSET_GRESET(cif->hwport);
kfree(chip->cif);
}
if (chip->irq >= 0)
free_irq(chip->irq, chip);
if (chip->fw_entry)
release_firmware(chip->fw_entry);
release_and_free_resource(chip->res_port);
if (chip->irq >= 0)
free_irq(chip->irq, chip);
kfree(chip);
return 0;
}
Expand Down

0 comments on commit 0a50d2b

Please sign in to comment.