aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/intel8x0.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/intel8x0.c')
-rw-r--r--sound/pci/intel8x0.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 6c896dbfd79..6a5b387b97f 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1884,6 +1884,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
1884 }, 1884 },
1885 { 1885 {
1886 .subvendor = 0x1028, 1886 .subvendor = 0x1028,
1887 .subdevice = 0x0189,
1888 .name = "Dell Inspiron 9300",
1889 .type = AC97_TUNE_HP_MUTE_LED
1890 },
1891 {
1892 .subvendor = 0x1028,
1887 .subdevice = 0x0191, 1893 .subdevice = 0x0191,
1888 .name = "Dell Inspiron 8600", 1894 .name = "Dell Inspiron 8600",
1889 .type = AC97_TUNE_HP_ONLY 1895 .type = AC97_TUNE_HP_ONLY
@@ -2647,7 +2653,7 @@ static int intel8x0_resume(struct pci_dev *pci)
2647 pci_set_master(pci); 2653 pci_set_master(pci);
2648 snd_intel8x0_chip_init(chip, 0); 2654 snd_intel8x0_chip_init(chip, 0);
2649 if (request_irq(pci->irq, snd_intel8x0_interrupt, 2655 if (request_irq(pci->irq, snd_intel8x0_interrupt,
2650 IRQF_SHARED, card->shortname, chip)) { 2656 IRQF_SHARED, KBUILD_MODNAME, chip)) {
2651 printk(KERN_ERR "intel8x0: unable to grab IRQ %d, " 2657 printk(KERN_ERR "intel8x0: unable to grab IRQ %d, "
2652 "disabling device\n", pci->irq); 2658 "disabling device\n", pci->irq);
2653 snd_card_disconnect(card); 2659 snd_card_disconnect(card);
@@ -3106,7 +3112,7 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,
3106 3112
3107 /* request irq after initializaing int_sta_mask, etc */ 3113 /* request irq after initializaing int_sta_mask, etc */
3108 if (request_irq(pci->irq, snd_intel8x0_interrupt, 3114 if (request_irq(pci->irq, snd_intel8x0_interrupt,
3109 IRQF_SHARED, card->shortname, chip)) { 3115 IRQF_SHARED, KBUILD_MODNAME, chip)) {
3110 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 3116 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
3111 snd_intel8x0_free(chip); 3117 snd_intel8x0_free(chip);
3112 return -EBUSY; 3118 return -EBUSY;
@@ -3266,7 +3272,7 @@ static void __devexit snd_intel8x0_remove(struct pci_dev *pci)
3266} 3272}
3267 3273
3268static struct pci_driver driver = { 3274static struct pci_driver driver = {
3269 .name = "Intel ICH", 3275 .name = KBUILD_MODNAME,
3270 .id_table = snd_intel8x0_ids, 3276 .id_table = snd_intel8x0_ids,
3271 .probe = snd_intel8x0_probe, 3277 .probe = snd_intel8x0_probe,
3272 .remove = __devexit_p(snd_intel8x0_remove), 3278 .remove = __devexit_p(snd_intel8x0_remove),