diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2008-04-22 13:50:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 12:00:40 +0200 |
| commit | f000fd80937c0d94c67f9f3e7026f1fbc8ef8873 (patch) | |
| tree | a1364921df5ed78b387a767787ea945031b5b641 /sound/pci/hda | |
| parent | 8a87c9cf999542db846c3ab93c1065d446427f37 (diff) | |
| download | blackbird-op-linux-f000fd80937c0d94c67f9f3e7026f1fbc8ef8873.tar.gz blackbird-op-linux-f000fd80937c0d94c67f9f3e7026f1fbc8ef8873.zip | |
[ALSA] Fix synchronize_irq() bugs, redundancies
free_irq() calls synchronize_irq() for you, so there is no need for
drivers to manually do the same thing (again). Thus, calls where
sync-irq immediately precedes free-irq can be simplified.
However, during this audit several bugs were noticed, where free-irq is
preceded by a "irq >= 0" check... but the sync-irq call is not covered
by the same check.
So, where sync-irq could not be eliminated completely, the missing check
was added.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index bc3867e1945c..b3a618eb42cd 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1682,7 +1682,6 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state) snd_hda_suspend(chip->bus, state); azx_stop_chip(chip); if (chip->irq >= 0) { - synchronize_irq(chip->irq); free_irq(chip->irq, chip); chip->irq = -1; } @@ -1738,10 +1737,8 @@ static int azx_free(struct azx *chip) azx_stop_chip(chip); } - if (chip->irq >= 0) { - synchronize_irq(chip->irq); + if (chip->irq >= 0) free_irq(chip->irq, (void*)chip); - } if (chip->msi) pci_disable_msi(chip->pci); if (chip->remap_addr) |
