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/intel8x0.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/intel8x0.c')
-rw-r--r-- | sound/pci/intel8x0.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 47485afcab5f..048d99e25ab0 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
@@ -2468,7 +2468,7 @@ static int snd_intel8x0_free(struct intel8x0 *chip) | |||
2468 | pci_write_config_dword(chip->pci, 0x4c, val); | 2468 | pci_write_config_dword(chip->pci, 0x4c, val); |
2469 | } | 2469 | } |
2470 | /* --- */ | 2470 | /* --- */ |
2471 | synchronize_irq(chip->irq); | 2471 | |
2472 | __hw_end: | 2472 | __hw_end: |
2473 | if (chip->irq >= 0) | 2473 | if (chip->irq >= 0) |
2474 | free_irq(chip->irq, chip); | 2474 | free_irq(chip->irq, chip); |
@@ -2517,7 +2517,6 @@ static int intel8x0_suspend(struct pci_dev *pci, pm_message_t state) | |||
2517 | chip->sdm_saved = igetbyte(chip, ICHREG(SDM)); | 2517 | chip->sdm_saved = igetbyte(chip, ICHREG(SDM)); |
2518 | 2518 | ||
2519 | if (chip->irq >= 0) { | 2519 | if (chip->irq >= 0) { |
2520 | synchronize_irq(chip->irq); | ||
2521 | free_irq(chip->irq, chip); | 2520 | free_irq(chip->irq, chip); |
2522 | chip->irq = -1; | 2521 | chip->irq = -1; |
2523 | } | 2522 | } |