diff options
author | Jeff Garzik <jgarzik@redhat.com> | 2008-04-22 07:50:34 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:40 -0400 |
commit | f000fd80937c0d94c67f9f3e7026f1fbc8ef8873 (patch) | |
tree | a1364921df5ed78b387a767787ea945031b5b641 /sound/pci/hda/hda_intel.c | |
parent | 8a87c9cf999542db846c3ab93c1065d446427f37 (diff) |
[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/hda_intel.c')
-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) | |||
1682 | snd_hda_suspend(chip->bus, state); | 1682 | snd_hda_suspend(chip->bus, state); |
1683 | azx_stop_chip(chip); | 1683 | azx_stop_chip(chip); |
1684 | if (chip->irq >= 0) { | 1684 | if (chip->irq >= 0) { |
1685 | synchronize_irq(chip->irq); | ||
1686 | free_irq(chip->irq, chip); | 1685 | free_irq(chip->irq, chip); |
1687 | chip->irq = -1; | 1686 | chip->irq = -1; |
1688 | } | 1687 | } |
@@ -1738,10 +1737,8 @@ static int azx_free(struct azx *chip) | |||
1738 | azx_stop_chip(chip); | 1737 | azx_stop_chip(chip); |
1739 | } | 1738 | } |
1740 | 1739 | ||
1741 | if (chip->irq >= 0) { | 1740 | if (chip->irq >= 0) |
1742 | synchronize_irq(chip->irq); | ||
1743 | free_irq(chip->irq, (void*)chip); | 1741 | free_irq(chip->irq, (void*)chip); |
1744 | } | ||
1745 | if (chip->msi) | 1742 | if (chip->msi) |
1746 | pci_disable_msi(chip->pci); | 1743 | pci_disable_msi(chip->pci); |
1747 | if (chip->remap_addr) | 1744 | if (chip->remap_addr) |