hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/hda' into topic/hda

This commit is contained in:
Takashi Iwai 2009-02-05 07:42:28 +01:00
parent 8f95c102c5 e8c0ee5d77
commit 306f47bd63
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/pci/hda/hda_codec.c
View File

@ -487,7 +487,6 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
{ {
struct hda_bus *bus; struct hda_bus *bus;
int err; int err;
char qname[8];
static struct snd_device_ops dev_ops = { static struct snd_device_ops dev_ops = {
.dev_register = snd_hda_bus_dev_register, .dev_register = snd_hda_bus_dev_register,
.dev_free = snd_hda_bus_dev_free, .dev_free = snd_hda_bus_dev_free,
@ -517,10 +516,12 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
mutex_init(&bus->cmd_mutex); mutex_init(&bus->cmd_mutex);
INIT_LIST_HEAD(&bus->codec_list); INIT_LIST_HEAD(&bus->codec_list);
snprintf(qname, sizeof(qname), "hda%d", card->number); snprintf(bus->workq_name, sizeof(bus->workq_name),
bus->workq = create_workqueue(qname); "hd-audio%d", card->number);
bus->workq = create_singlethread_workqueue(bus->workq_name);
if (!bus->workq) { if (!bus->workq) {
snd_printk(KERN_ERR "cannot create workqueue %s\n", qname); snd_printk(KERN_ERR "cannot create workqueue %s\n",
bus->workq_name);
kfree(bus); kfree(bus);
return -ENOMEM; return -ENOMEM;
} }

1
sound/pci/hda/hda_codec.h
View File

@ -614,6 +614,7 @@ struct hda_bus {
/* unsolicited event queue */ /* unsolicited event queue */
struct hda_bus_unsolicited *unsol; struct hda_bus_unsolicited *unsol;
char workq_name[16];
struct workqueue_struct *workq; /* common workqueue for codecs */ struct workqueue_struct *workq; /* common workqueue for codecs */
/* assigned PCMs */ /* assigned PCMs */