Merge branch 'linus' into x86/amd-iommu

[linux-2.6] / sound / pci / via82xx.c

diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index ad58ca5bf80a1cd14fa3436fe2f15f9aca5d4a6e..6781be9e3078ac702364770f407fbc4458486882 100644 (file)
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -46,7 +46,6 @@
  *     - Optimize position calculation for the 823x chips. 
  */
 
-#include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -1757,6 +1756,12 @@ static struct ac97_quirk ac97_quirks[] = {
                .name = "ECS L7VMM2",
                .type = AC97_TUNE_HP_ONLY
        },
+       {
+               .subvendor = 0x1019,
+               .subdevice = 0x1841,
+               .name = "ECS K7VTA3",
+               .type = AC97_TUNE_HP_ONLY
+       },
        {
                .subvendor = 0x1849,
                .subdevice = 0x3059,
@@ -2237,10 +2242,10 @@ static int snd_via82xx_free(struct via82xx *chip)
        /* disable interrupts */
        for (i = 0; i < chip->num_devs; i++)
                snd_via82xx_channel_reset(chip, &chip->devs[i]);
-       synchronize_irq(chip->irq);
-      __end_hw:
+
        if (chip->irq >= 0)
                free_irq(chip->irq, chip);
+ __end_hw:
        release_and_free_resource(chip->mpu_res);
        pci_release_regions(chip->pci);