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/oxygen | |
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/oxygen')
-rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index f84f6a128ee9..897697d43506 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c | |||
@@ -410,10 +410,8 @@ static void oxygen_card_free(struct snd_card *card) | |||
410 | oxygen_write16(chip, OXYGEN_DMA_STATUS, 0); | 410 | oxygen_write16(chip, OXYGEN_DMA_STATUS, 0); |
411 | oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, 0); | 411 | oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, 0); |
412 | spin_unlock_irq(&chip->reg_lock); | 412 | spin_unlock_irq(&chip->reg_lock); |
413 | if (chip->irq >= 0) { | 413 | if (chip->irq >= 0) |
414 | free_irq(chip->irq, chip); | 414 | free_irq(chip->irq, chip); |
415 | synchronize_irq(chip->irq); | ||
416 | } | ||
417 | flush_scheduled_work(); | 415 | flush_scheduled_work(); |
418 | chip->model->cleanup(chip); | 416 | chip->model->cleanup(chip); |
419 | mutex_destroy(&chip->mutex); | 417 | mutex_destroy(&chip->mutex); |