tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fix/hda' into for-linus

Takashi Iwai b2573eb5 9be260a6

+10 -4
unified split
+5 -4
sound/pci/hda/hda_codec.c
··· 487 { 488 struct hda_bus *bus; 489 int err; 490 - char qname[8]; 491 static struct snd_device_ops dev_ops = { 492 .dev_register = snd_hda_bus_dev_register, 493 .dev_free = snd_hda_bus_dev_free, ··· 516 mutex_init(&bus->cmd_mutex); 517 INIT_LIST_HEAD(&bus->codec_list); 518 519 - snprintf(qname, sizeof(qname), "hda%d", card->number); 520 - bus->workq = create_workqueue(qname); 521 if (!bus->workq) { 522 - snd_printk(KERN_ERR "cannot create workqueue %s\n", qname); 523 kfree(bus); 524 return -ENOMEM; 525 }
··· 487 { 488 struct hda_bus *bus; 489 int err; 490 static struct snd_device_ops dev_ops = { 491 .dev_register = snd_hda_bus_dev_register, 492 .dev_free = snd_hda_bus_dev_free, ··· 517 mutex_init(&bus->cmd_mutex); 518 INIT_LIST_HEAD(&bus->codec_list); 519 520 + snprintf(bus->workq_name, sizeof(bus->workq_name), 521 + "hd-audio%d", card->number); 522 + bus->workq = create_singlethread_workqueue(bus->workq_name); 523 if (!bus->workq) { 524 + snd_printk(KERN_ERR "cannot create workqueue %s\n", 525 + bus->workq_name); 526 kfree(bus); 527 return -ENOMEM; 528 }
+1
sound/pci/hda/hda_codec.h
··· 614 615 /* unsolicited event queue */ 616 struct hda_bus_unsolicited *unsol; 617 struct workqueue_struct *workq; /* common workqueue for codecs */ 618 619 /* assigned PCMs */
··· 614 615 /* unsolicited event queue */ 616 struct hda_bus_unsolicited *unsol; 617 + char workq_name[16]; 618 struct workqueue_struct *workq; /* common workqueue for codecs */ 619 620 /* assigned PCMs */
+4
sound/pci/hda/patch_realtek.c
··· 1037 case 0x10ec0267: 1038 case 0x10ec0268: 1039 case 0x10ec0269: 1040 case 0x10ec0660: 1041 case 0x10ec0662: 1042 case 0x10ec0663: ··· 1066 case 0x10ec0882: 1067 case 0x10ec0883: 1068 case 0x10ec0885: 1069 case 0x10ec0889: 1070 snd_hda_codec_write(codec, 0x20, 0, 1071 AC_VERB_SET_COEF_INDEX, 7); ··· 8517 SND_PCI_QUIRK(0x1558, 0, "Clevo laptop", ALC883_LAPTOP_EAPD), 8518 SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch), 8519 SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION), 8520 SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515), 8521 SND_PCI_QUIRK(0x1734, 0x113d, "Fujitsu AMILO Xa3530", 8522 ALC888_FUJITSU_XA3530),
··· 1037 case 0x10ec0267: 1038 case 0x10ec0268: 1039 case 0x10ec0269: 1040 + case 0x10ec0272: 1041 case 0x10ec0660: 1042 case 0x10ec0662: 1043 case 0x10ec0663: ··· 1065 case 0x10ec0882: 1066 case 0x10ec0883: 1067 case 0x10ec0885: 1068 + case 0x10ec0887: 1069 case 0x10ec0889: 1070 snd_hda_codec_write(codec, 0x20, 0, 1071 AC_VERB_SET_COEF_INDEX, 7); ··· 8515 SND_PCI_QUIRK(0x1558, 0, "Clevo laptop", ALC883_LAPTOP_EAPD), 8516 SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch), 8517 SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION), 8518 + SND_PCI_QUIRK(0x1734, 0x1107, "FSC AMILO Xi2550", 8519 + ALC883_FUJITSU_PI2515), 8520 SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515), 8521 SND_PCI_QUIRK(0x1734, 0x113d, "Fujitsu AMILO Xa3530", 8522 ALC888_FUJITSU_XA3530),