[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>

2 files changed, 3 insertions, 6 deletions

diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 38e93ca12e27..29d449d73c98 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2490,10 +2490,9 @@ static int snd_ice1712_free(struct snd_ice1712 *ice)
         outb(0xff, ICEREG(ice, IRQMASK));
         /* --- */
       __hw_end:
-        if (ice->irq >= 0) {
-                synchronize_irq(ice->irq);
+        if (ice->irq >= 0)
                 free_irq(ice->irq, ice);
-        }
+
         if (ice->port)
                 pci_release_regions(ice->pci);
         snd_ice1712_akm4xxx_free(ice);
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 6b15e1cbfe4f..13ea94f317cb 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2153,10 +2153,8 @@ static int snd_vt1724_free(struct snd_ice1712 *ice)
         outb(0xff, ICEREG1724(ice, IRQMASK));
         /* --- */
       __hw_end:
-        if (ice->irq >= 0) {
-                synchronize_irq(ice->irq);
+        if (ice->irq >= 0)
                 free_irq(ice->irq, ice);
-        }
         pci_release_regions(ice->pci);
         snd_ice1712_akm4xxx_free(ice);
         pci_disable_device(ice->pci);