From 3176dd16a5234a3e1f5dedb69aa3474b315f0df2 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sat, 22 Mar 2008 10:11:08 +0100 Subject: [PATCH] --- yaml --- r: 92169 b: refs/heads/master c: 95866d38028c98ea4d6df6947f6ea3fd77334382 h: refs/heads/master i: 92167: 6e903eff6b46d0da4be9d6d7615b0f7e1fefc329 v: v3 --- [refs] | 2 +- trunk/sound/pci/ymfpci/ymfpci_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f37833e7148a..30da7634a0dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd97f47df377d2371940b69fa4c8b4d99a980580 +refs/heads/master: 95866d38028c98ea4d6df6947f6ea3fd77334382 diff --git a/trunk/sound/pci/ymfpci/ymfpci_main.c b/trunk/sound/pci/ymfpci/ymfpci_main.c index 42c1eb7d35f5..29b3056c5109 100644 --- a/trunk/sound/pci/ymfpci/ymfpci_main.c +++ b/trunk/sound/pci/ymfpci/ymfpci_main.c @@ -2249,6 +2249,8 @@ static int snd_ymfpci_free(struct snd_ymfpci *chip) #ifdef CONFIG_PM vfree(chip->saved_regs); #endif + if (chip->irq >= 0) + free_irq(chip->irq, chip); release_and_free_resource(chip->mpu_res); release_and_free_resource(chip->fm_res); snd_ymfpci_free_gameport(chip); @@ -2257,8 +2259,6 @@ static int snd_ymfpci_free(struct snd_ymfpci *chip) if (chip->work_ptr.area) snd_dma_free_pages(&chip->work_ptr); - if (chip->irq >= 0) - free_irq(chip->irq, chip); release_and_free_resource(chip->res_reg_area); pci_write_config_word(chip->pci, 0x40, chip->old_legacy_ctrl);