diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 07:42:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 07:42:28 +0100 |
| commit | 306f47bd639b352b29193a3b69ef1d3546003efb (patch) | |
| tree | a8db2f6832b839fa1126aa6dd3d1e716f6377f02 /sound | |
| parent | 8f95c102c562851d8789fe813569db233d3f5378 (diff) | |
| parent | e8c0ee5d77ec0f144c753a622c67dd96fa195d50 (diff) | |
| download | kernel_samsung_aries-306f47bd639b352b29193a3b69ef1d3546003efb.zip kernel_samsung_aries-306f47bd639b352b29193a3b69ef1d3546003efb.tar.gz kernel_samsung_aries-306f47bd639b352b29193a3b69ef1d3546003efb.tar.bz2 | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 9 | ||||
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index a259b3e..c915879 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -487,7 +487,6 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, { struct hda_bus *bus; int err; - char qname[8]; static struct snd_device_ops dev_ops = { .dev_register = snd_hda_bus_dev_register, .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); INIT_LIST_HEAD(&bus->codec_list); - snprintf(qname, sizeof(qname), "hda%d", card->number); - bus->workq = create_workqueue(qname); + snprintf(bus->workq_name, sizeof(bus->workq_name), + "hd-audio%d", card->number); + bus->workq = create_singlethread_workqueue(bus->workq_name); 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); return -ENOMEM; } diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 5810ef5..09a332a 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -614,6 +614,7 @@ struct hda_bus { /* unsolicited event queue */ struct hda_bus_unsolicited *unsol; + char workq_name[16]; struct workqueue_struct *workq; /* common workqueue for codecs */ /* assigned PCMs */ |