projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: asihpi - Remove unused structures, macros and functions
[cascardo/linux.git]
/
sound
/
pci
/
intel8x0.c
diff --git
a/sound/pci/intel8x0.c
b/sound/pci/intel8x0.c
index
6c896db
..
6a5b387
100644
(file)
--- a/
sound/pci/intel8x0.c
+++ b/
sound/pci/intel8x0.c
@@
-1882,6
+1882,12
@@
static struct ac97_quirk ac97_quirks[] __devinitdata = {
.name = "Dell Inspiron 6000",
.type = AC97_TUNE_HP_MUTE_LED /* cf. Malone #41015 */
},
.name = "Dell Inspiron 6000",
.type = AC97_TUNE_HP_MUTE_LED /* cf. Malone #41015 */
},
+ {
+ .subvendor = 0x1028,
+ .subdevice = 0x0189,
+ .name = "Dell Inspiron 9300",
+ .type = AC97_TUNE_HP_MUTE_LED
+ },
{
.subvendor = 0x1028,
.subdevice = 0x0191,
{
.subvendor = 0x1028,
.subdevice = 0x0191,
@@
-2647,7
+2653,7
@@
static int intel8x0_resume(struct pci_dev *pci)
pci_set_master(pci);
snd_intel8x0_chip_init(chip, 0);
if (request_irq(pci->irq, snd_intel8x0_interrupt,
pci_set_master(pci);
snd_intel8x0_chip_init(chip, 0);
if (request_irq(pci->irq, snd_intel8x0_interrupt,
- IRQF_SHARED,
card->shortname
, chip)) {
+ IRQF_SHARED,
KBUILD_MODNAME
, chip)) {
printk(KERN_ERR "intel8x0: unable to grab IRQ %d, "
"disabling device\n", pci->irq);
snd_card_disconnect(card);
printk(KERN_ERR "intel8x0: unable to grab IRQ %d, "
"disabling device\n", pci->irq);
snd_card_disconnect(card);
@@
-3106,7
+3112,7
@@
static int __devinit snd_intel8x0_create(struct snd_card *card,
/* request irq after initializaing int_sta_mask, etc */
if (request_irq(pci->irq, snd_intel8x0_interrupt,
/* request irq after initializaing int_sta_mask, etc */
if (request_irq(pci->irq, snd_intel8x0_interrupt,
- IRQF_SHARED,
card->shortname
, chip)) {
+ IRQF_SHARED,
KBUILD_MODNAME
, chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_intel8x0_free(chip);
return -EBUSY;
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_intel8x0_free(chip);
return -EBUSY;
@@
-3266,7
+3272,7
@@
static void __devexit snd_intel8x0_remove(struct pci_dev *pci)
}
static struct pci_driver driver = {
}
static struct pci_driver driver = {
- .name =
"Intel ICH"
,
+ .name =
KBUILD_MODNAME
,
.id_table = snd_intel8x0_ids,
.probe = snd_intel8x0_probe,
.remove = __devexit_p(snd_intel8x0_remove),
.id_table = snd_intel8x0_ids,
.probe = snd_intel8x0_probe,
.remove = __devexit_p(snd_intel8x0_remove),